Skip to content

Commit 6da9ee7

Browse files
committed
Fix v8 gcc Bazel build using -Wno-nonnull. Fixes #340.
Signed-off-by: Martijn Stevenson <[email protected]>
1 parent 94497de commit 6da9ee7

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

bazel/external/v8.patch

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
# 1. Disable pointer compression (limits the maximum number of WasmVMs).
2-
# 2. Don't expose Wasm C API (only Wasm C++ API).
3-
41
diff --git a/BUILD.bazel b/BUILD.bazel
5-
index 5fb10d3940..a19930d36e 100644
2+
index 4e89f90e7e..3fcb38b3f3 100644
63
--- a/BUILD.bazel
74
+++ b/BUILD.bazel
8-
@@ -161,7 +161,7 @@ v8_int(
5+
@@ -157,7 +157,7 @@ v8_int(
96
# If no explicit value for v8_enable_pointer_compression, we set it to 'none'.
107
v8_string(
118
name = "v8_enable_pointer_compression",
@@ -14,11 +11,23 @@ index 5fb10d3940..a19930d36e 100644
1411
)
1512

1613
# Default setting for v8_enable_pointer_compression.
14+
diff --git a/bazel/defs.bzl b/bazel/defs.bzl
15+
index e957c0fad3..063627b72b 100644
16+
--- a/bazel/defs.bzl
17+
+++ b/bazel/defs.bzl
18+
@@ -131,6 +131,7 @@ def _default_args():
19+
"-Wno-redundant-move",
20+
"-Wno-return-type",
21+
"-Wno-stringop-overflow",
22+
+ "-Wno-nonnull",
23+
# Use GNU dialect, because GCC doesn't allow using
24+
# ##__VA_ARGS__ when in standards-conforming mode.
25+
"-std=gnu++17",
1726
diff --git a/src/wasm/c-api.cc b/src/wasm/c-api.cc
18-
index ce3f569fd5..dc8a4c4f6a 100644
27+
index 4473e205c0..65a6ec7e1d 100644
1928
--- a/src/wasm/c-api.cc
2029
+++ b/src/wasm/c-api.cc
21-
@@ -2238,6 +2238,8 @@ auto Instance::exports() const -> ownvec<Extern> {
30+
@@ -2247,6 +2247,8 @@ auto Instance::exports() const -> ownvec<Extern> {
2231

2332
} // namespace wasm
2433

@@ -27,7 +36,7 @@ index ce3f569fd5..dc8a4c4f6a 100644
2736
// BEGIN FILE wasm-c.cc
2837

2938
extern "C" {
30-
@@ -3257,3 +3259,5 @@ wasm_instance_t* wasm_frame_instance(const wasm_frame_t* frame) {
39+
@@ -3274,3 +3276,5 @@ wasm_instance_t* wasm_frame_instance(const wasm_frame_t* frame) {
3140
#undef WASM_DEFINE_SHARABLE_REF
3241

3342
} // extern "C"

0 commit comments

Comments
 (0)