Skip to content

Commit 12fe4a7

Browse files
committed
1 parent a717939 commit 12fe4a7

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

patches/wasm/build.patch

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn
2-
index 147226d..92ef627 100644
2+
index 12595c1e3..dc906cb43 100644
33
--- a/config/BUILDCONFIG.gn
44
+++ b/config/BUILDCONFIG.gn
5-
@@ -287,10 +287,7 @@ if (target_os == "android") {
5+
@@ -286,11 +286,7 @@ if (target_os == "android") {
66
} else if (target_os == "zos") {
77
_default_toolchain = "//build/toolchain/zos:$target_cpu"
88
} else if (target_os == "emscripten") {
9-
- # Because it's too hard to remove all targets from //BUILD.gn that do not work with it.
9+
- # Because it's too hard to remove all targets from //BUILD.gn that do not work
10+
- # with it.
1011
- assert(
1112
- false,
1213
- "emscripten is not a supported target_os. It is available only as secondary toolchain.")
@@ -15,10 +16,10 @@ index 147226d..92ef627 100644
1516
assert(false, "Unsupported target_os: $target_os")
1617
}
1718
diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn
18-
index 5103543..6bf11a8 100644
19+
index e1da11405..7a8dddecd 100644
1920
--- a/config/compiler/BUILD.gn
2021
+++ b/config/compiler/BUILD.gn
21-
@@ -309,6 +309,8 @@ config("compiler") {
22+
@@ -355,6 +355,8 @@ config("compiler") {
2223
configs += [ "//build/config/aix:compiler" ]
2324
} else if (current_os == "zos") {
2425
configs += [ "//build/config/zos:compiler" ]
@@ -27,7 +28,7 @@ index 5103543..6bf11a8 100644
2728
}
2829

2930
configs += [
30-
@@ -395,7 +397,7 @@ config("compiler") {
31+
@@ -457,7 +459,7 @@ config("compiler") {
3132
} else if (is_chromeos) {
3233
cflags += [ "-fstack-protector-strong" ]
3334
} else if (is_posix || is_fuchsia) {
@@ -37,7 +38,7 @@ index 5103543..6bf11a8 100644
3738
cflags += [ "-fstack-protector" ]
3839
}
3940
diff --git a/toolchain/wasm/BUILD.gn b/toolchain/wasm/BUILD.gn
40-
index 4b4d65c..08612bf 100644
41+
index 6bdb7db77..1dd9adf08 100644
4142
--- a/toolchain/wasm/BUILD.gn
4243
+++ b/toolchain/wasm/BUILD.gn
4344
@@ -25,6 +25,9 @@ gcc_toolchain("wasm") {

0 commit comments

Comments
 (0)