build.patch

changeset:   473589:4afcb87593a5
tag:         tip
user:        Jason Orendorff <[email protected]>
date:        Tue Apr 17 14:12:42 2018 +0200
summary:     Bug 1454613 - Build binsource when building SpiderMonkey

diff --git a/js/src/frontend/binsource/Cargo.toml b/js/src/frontend/binsource/Cargo.toml
--- a/js/src/frontend/binsource/Cargo.toml
+++ b/js/src/frontend/binsource/Cargo.toml
@@ -6,8 +6,12 @@ authors = ["David Teller <D.O.Teller@gma
 [dependencies]
 binjs_meta = "^0.3.6"
 clap = "^2"
 env_logger = "^0.5.6"
 itertools = "^0.7.6"
 log = "0.4.1"
 yaml-rust = "^0.4"
 webidl = "^0.6.0"
+
+[[bin]]
+name = "binsource"
+path = "src/main.rs"
diff --git a/js/src/frontend/binsource/moz.build b/js/src/frontend/binsource/moz.build
new file mode 100644
--- /dev/null
+++ b/js/src/frontend/binsource/moz.build
@@ -0,0 +1,1 @@
+RUST_PROGRAMS += ['binsource']
diff --git a/js/src/moz.build b/js/src/moz.build
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -41,16 +41,18 @@ with Files('builtin/intl/*'):
 
 
 if CONFIG['JS_BUNDLED_EDITLINE']:
     DIRS += ['editline']
 
 if not CONFIG['JS_DISABLE_SHELL']:
     DIRS += ['shell']
 
+DIRS += ['frontend/binsource']
+
 TEST_DIRS += ['jsapi-tests', 'tests', 'gdb']
 
 if CONFIG['FUZZING_INTERFACES']:
     TEST_DIRS += [
         'fuzz-tests',
     ]
 
 if CONFIG['FUZZING_INTERFACES'] and CONFIG['LIBFUZZER']:

output.console

$ mach build
 0:00.64 Clobber not needed.
 0:00.64 Adding make options from /Users/jorendorff/work/gecko/mozconfig
    MOZ_OBJDIR=/Users/jorendorff/work/gecko/obj-x86_64-apple-darwin17.4.0
    OBJDIR=/Users/jorendorff/work/gecko/obj-x86_64-apple-darwin17.4.0
    FOUND_MOZCONFIG=/Users/jorendorff/work/gecko/mozconfig
    export FOUND_MOZCONFIG
 0:00.66 /usr/bin/make -f client.mk -s
 0:01.00 Build configuration changed. Regenerating backend.
 0:01.25 Reticulating splines...
 0:01.37 Traceback (most recent call last):
 0:01.37   File "config.status", line 1015, in <module>
 0:01.37     config_status(**args)
 0:01.37   File "/Users/jorendorff/work/gecko/python/mozbuild/mozbuild/config_status.py", line 144, in config_status
 0:01.37     definitions = list(definitions)
 0:01.37   File "/Users/jorendorff/work/gecko/python/mozbuild/mozbuild/frontend/emitter.py", line 184, in emit
 0:01.37     objs = list(emitfn(out))
 0:01.37   File "/Users/jorendorff/work/gecko/python/mozbuild/mozbuild/frontend/emitter.py", line 1148, in emit_from_context
 0:01.37     for obj in self._handle_linkables(context, passthru, generated_files):
 0:01.37   File "/Users/jorendorff/work/gecko/python/mozbuild/mozbuild/frontend/emitter.py", line 619, in _handle_linkables
 0:01.37     self._binaries[program] = cls(context, program, cargo_file)
 0:01.37   File "/Users/jorendorff/work/gecko/python/mozbuild/mozbuild/frontend/data.py", line 562, in __init__
 0:01.37     cargo_dir = cargo_output_directory(context, self.TARGET_SUBST_VAR)
 0:01.37   File "/Users/jorendorff/work/gecko/python/mozbuild/mozbuild/frontend/data.py", line 543, in cargo_output_directory
 0:01.37     return mozpath.join(context.config.substs[target_var], rust_build_kind)
 0:01.37 KeyError: u'RUST_TARGET'
 0:01.39 make[1]: *** [backend.RecursiveMakeBackend] Error 1
 0:01.39 make: *** [build] Error 2
 0:01.42 327 compiler warnings present.