From 3715e576d2267767a35d1b0a42d80a073046fd52 Mon Sep 17 00:00:00 2001 From: NTD Date: Thu, 27 Sep 2018 02:08:07 -0400 Subject: [PATCH] Add a conditional to not build the platform so the build system can be exploited for non-binary projects --- moz.build | 103 +++++++++++++++++++++++++++--------------------------- 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/moz.build b/moz.build index 2c02ec3a01..401f938e2e 100644 --- a/moz.build +++ b/moz.build @@ -24,61 +24,62 @@ DIRS += [ 'taskcluster', ] -if not CONFIG['JS_STANDALONE']: - CONFIGURE_SUBST_FILES += [ - 'tools/update-packaging/Makefile', - ] - CONFIGURE_DEFINE_FILES += [ - 'mozilla-config.h', - ] - EXPORTS += [ - '!buildid.h', - '!mozilla-config.h', - '!source-repo.h', - ] - - GENERATED_FILES += [ - 'buildid.h', - 'source-repo.h', - ] - - GENERATED_FILES['buildid.h'].script = 'build/variables.py:buildid_header' - GENERATED_FILES['source-repo.h'].script = 'build/variables.py:source_repo_header' - - DIRS += [ - 'build', - 'probes', - ] - -DIRS += [ - 'config/external/fdlibm', - 'config/external/nspr', - 'config/external/zlib', - 'memory', - 'mfbt', - 'mozglue', -] - -if not CONFIG['JS_STANDALONE']: - DIRS += ['xpcom/xpidl'] - -if CONFIG['USE_ICU']: - DIRS += ['config/external/icu'] - -if CONFIG['COMPILE_ENVIRONMENT']: - +if not CONFIG['MOZ_DISABLE_PLATFORM']: if not CONFIG['JS_STANDALONE']: - DIRS += [ - 'config/external', - 'config/external/nss', + CONFIGURE_SUBST_FILES += [ + 'tools/update-packaging/Makefile', + ] + CONFIGURE_DEFINE_FILES += [ + 'mozilla-config.h', + ] + EXPORTS += [ + '!buildid.h', + '!mozilla-config.h', + '!source-repo.h', ] - if CONFIG['BUILD_CTYPES']: - DIRS += ['config/external/ffi'] + GENERATED_FILES += [ + 'buildid.h', + 'source-repo.h', + ] - DIRS += ['js/src'] -else: - TEST_DIRS += ['js/src/tests'] + GENERATED_FILES['buildid.h'].script = 'build/variables.py:buildid_header' + GENERATED_FILES['source-repo.h'].script = 'build/variables.py:source_repo_header' + + DIRS += [ + 'build', + 'probes', + ] + + DIRS += [ + 'config/external/fdlibm', + 'config/external/nspr', + 'config/external/zlib', + 'memory', + 'mfbt', + 'mozglue', + ] + + if not CONFIG['JS_STANDALONE']: + DIRS += ['xpcom/xpidl'] + + if CONFIG['USE_ICU']: + DIRS += ['config/external/icu'] + + if CONFIG['COMPILE_ENVIRONMENT']: + + if not CONFIG['JS_STANDALONE']: + DIRS += [ + 'config/external', + 'config/external/nss', + ] + + if CONFIG['BUILD_CTYPES']: + DIRS += ['config/external/ffi'] + + DIRS += ['js/src'] + else: + TEST_DIRS += ['js/src/tests'] if not CONFIG['JS_STANDALONE'] and CONFIG['MOZ_BUILD_APP']: # Bring in the configuration for the configured application.