Skip to content

Commit ceadbf3

Browse files
committed
Deal with having no clang path in standalone builds.
1 parent 9a0e973 commit ceadbf3

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/mozjs/build/moz.configure/bindgen.configure b/mozjs/build/moz.configure/bindgen.configure
2+
index 1658c8f93e..f7082ea6d4 100644
3+
--- a/mozjs/build/moz.configure/bindgen.configure
4+
+++ b/mozjs/build/moz.configure/bindgen.configure
5+
@@ -246,6 +246,9 @@ set_config('MOZ_CLANG_PATH', bindgen_config_paths.clang_path)
6+
@depends(target, target_is_unix, cxx_compiler, bindgen_cflags_android,
7+
bindgen_config_paths.clang_path)
8+
def basic_bindgen_cflags(target, is_unix, compiler_info, android_cflags, clang_path):
9+
+ if not clang_path:
10+
+ return []
11+
+
12+
args = [
13+
'-x', 'c++', '-fno-sized-deallocation',
14+
'-DTRACING=1', '-DIMPL_LIBXUL', '-DMOZILLA_INTERNAL_API',

mozjs/build/moz.configure/bindgen.configure

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,9 @@ set_config('MOZ_CLANG_PATH', bindgen_config_paths.clang_path)
246246
@depends(target, target_is_unix, cxx_compiler, bindgen_cflags_android,
247247
bindgen_config_paths.clang_path)
248248
def basic_bindgen_cflags(target, is_unix, compiler_info, android_cflags, clang_path):
249+
if not clang_path:
250+
return []
251+
249252
args = [
250253
'-x', 'c++', '-fno-sized-deallocation',
251254
'-DTRACING=1', '-DIMPL_LIBXUL', '-DMOZILLA_INTERNAL_API',

0 commit comments

Comments
 (0)