diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-09-27 09:07:52 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-09-27 09:07:52 +0200 |
| commit | 314fb761d144b160d3aeb72840c89e31c4f21a4a (patch) | |
| tree | 0794190c7b9f541b3dced0b1f6b15979f447e3e5 /moz.build | |
| parent | fbaab39c94a047f2a0b0bfbe6cf24a790cd7e8b5 (diff) | |
| parent | 2b9e0ca0bbea04fca6e0fd5079877d355f27c9b6 (diff) | |
| download | UXP-314fb761d144b160d3aeb72840c89e31c4f21a4a.tar UXP-314fb761d144b160d3aeb72840c89e31c4f21a4a.tar.gz UXP-314fb761d144b160d3aeb72840c89e31c4f21a4a.tar.lz UXP-314fb761d144b160d3aeb72840c89e31c4f21a4a.tar.xz UXP-314fb761d144b160d3aeb72840c89e31c4f21a4a.zip | |
Merge branch 'master' into Basilisk-releasev2018.09.27
Diffstat (limited to 'moz.build')
| -rw-r--r-- | moz.build | 89 |
1 files changed, 45 insertions, 44 deletions
@@ -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', - ] +if not CONFIG['MOZ_DISABLE_PLATFORM']: + 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', + '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' + 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 += [ - 'build', - 'probes', + 'config/external/fdlibm', + 'config/external/nspr', + 'config/external/zlib', + 'memory', + 'mfbt', + 'mozglue', ] -DIRS += [ - 'config/external/fdlibm', - 'config/external/nspr', - 'config/external/zlib', - 'memory', - 'mfbt', - 'mozglue', -] - -if not CONFIG['JS_STANDALONE']: - DIRS += ['xpcom/xpidl'] + if not CONFIG['JS_STANDALONE']: + DIRS += ['xpcom/xpidl'] -if CONFIG['USE_ICU']: - DIRS += ['config/external/icu'] + if CONFIG['USE_ICU']: + DIRS += ['config/external/icu'] -if CONFIG['COMPILE_ENVIRONMENT']: + if CONFIG['COMPILE_ENVIRONMENT']: - if not CONFIG['JS_STANDALONE']: - DIRS += [ - 'config/external', - 'config/external/nss', - ] + if not CONFIG['JS_STANDALONE']: + DIRS += [ + 'config/external', + 'config/external/nss', + ] - if CONFIG['BUILD_CTYPES']: - DIRS += ['config/external/ffi'] + if CONFIG['BUILD_CTYPES']: + DIRS += ['config/external/ffi'] - DIRS += ['js/src'] -else: - TEST_DIRS += ['js/src/tests'] + 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. |