Skip to content

Commit 6c857a3

Browse files
committed
Force the dart_sdk.patch file to use lf eol settings
1 parent fcaae57 commit 6c857a3

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Default
2+
* text=auto
3+
4+
dart_sdk.patch text eol=lf

dart_sdk.patch

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ index fb3ca5fc537..9760a092244 100644
1414
import("runtime/runtime_args.gni")
1515
if (dart_target_arch != "ia32" && dart_target_arch != "x86") {
1616
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
17-
index b77bab8676c..70ecff6ed17 100644
17+
index b77bab8676c..b9739fab43a 100644
1818
--- a/build/config/compiler/BUILD.gn
1919
+++ b/build/config/compiler/BUILD.gn
2020
@@ -254,8 +254,9 @@ config("compiler") {
@@ -23,22 +23,21 @@ index b77bab8676c..70ecff6ed17 100644
2323
} else {
2424
- cflags += [ "-fPIE" ]
2525
- ldflags += [ "-fPIE" ]
26-
+ # dart_shared_library overriden - we need -fPIC to properly build
27-
+ cflags += [ "-fPIC" ]
28-
+ ldflags += [ "-fPIC" ]
26+
+ # dart_shared_library overriden - we need -fPIC to properly build
27+
+ cflags += [ "-fPIC" ]
28+
+ ldflags += [ "-fPIC" ]
2929
}
3030
}
3131

3232
diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn
33-
index 57d7006036d..0eeeff15c8f 100644
33+
index 57d7006036d..fd677355210 100644
3434
--- a/runtime/bin/BUILD.gn
3535
+++ b/runtime/bin/BUILD.gn
36-
@@ -1224,3 +1224,48 @@ static_library("dart_embedder_runtime_jit") {
36+
@@ -1224,3 +1224,47 @@ static_library("dart_embedder_runtime_jit") {
3737
output_name = "dart_embedder_runtime_jit"
3838
deps = [ ":dart_embedder_runtime_jit_set" ]
3939
}
4040
+
41-
+
4241
+static_library("libdart") {
4342
+ deps = [
4443
+ ":standalone_dart_io",

0 commit comments

Comments
 (0)