Bug 1441275 - list outputs of embedjs.py correctly; r?Build
embedjs.py produces two outputs, so we should list them both in the
GENERATED_FILES rule. This avoids unspecified output errors when using
the tup backend.
MozReview-Commit-ID: IA70e6IcuC
--- a/js/src/shell/moz.build
+++ b/js/src/shell/moz.build
@@ -37,18 +37,18 @@ OS_LIBS += CONFIG['EDITLINE_LIBS']
OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
if CONFIG['ENABLE_INTL_API'] and CONFIG['MOZ_ICU_DATA_ARCHIVE']:
# The ICU libraries linked into libmozjs will not include the ICU data,
# so link it directly.
USE_LIBS += ['icudata']
# Prepare module loader JS code for embedding
-GENERATED_FILES += ['shellmoduleloader.out.h']
-shellmoduleloader = GENERATED_FILES['shellmoduleloader.out.h']
+GENERATED_FILES += [('shellmoduleloader.out.h', 'shellmoduleloader.js')]
+shellmoduleloader = GENERATED_FILES[('shellmoduleloader.out.h', 'shellmoduleloader.js')]
shellmoduleloader.script = '../builtin/embedjs.py:generate_shellmoduleloader'
shellmoduleloader.inputs = [
'../js.msg',
'ModuleLoader.js',
]
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
CXXFLAGS += ['-Wno-shadow', '-Werror=format']