Bug 1549954 - Link in-tree brotli library if BinAST is enabled. r=glandium
☠☠ backed out by c9760dcf5583 ☠ ☠
authorTooru Fujisawa <arai_a@mac.com>
Tue, 21 May 2019 15:09:03 +0000
changeset 474761 2a4a5afa1ff204c9052697e573391992ee99e4c7
parent 474760 1d79999a70f3ffd534c55fd4093d7c766a04f942
child 474762 aac842bf7f7ba409ecf1bc980c874d479dcb5e48
push id36046
push useraiakab@mozilla.com
push dateTue, 21 May 2019 21:45:52 +0000
treeherdermozilla-central@257f2c96cef5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1549954
milestone69.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1549954 - Link in-tree brotli library if BinAST is enabled. r=glandium Differential Revision: https://phabricator.services.mozilla.com/D30476
js/app.mozbuild
js/src/build/moz.build
js/src/make-source-package.sh
--- a/js/app.mozbuild
+++ b/js/app.mozbuild
@@ -21,16 +21,21 @@ if CONFIG['JS_STANDALONE'] and CONFIG['O
 DIRS += [
     '/config/external/fdlibm',
     '/config/external/nspr',
     '/config/external/zlib',
     '/memory',
     '/mozglue',
 ]
 
+if CONFIG['JS_BUILD_BINAST']:
+    DIRS += [
+        '/modules/brotli',
+    ]
+
 if CONFIG['USE_ICU']:
     DIRS += [
         '/config/external/icu',
     ]
 
 if CONFIG['COMPILE_ENVIRONMENT'] and CONFIG['BUILD_CTYPES']:
     DIRS += [
         '/config/external/ffi',
--- a/js/src/build/moz.build
+++ b/js/src/build/moz.build
@@ -47,16 +47,21 @@ if CONFIG['ENABLE_INTL_API']:
         'icu',
     ]
 
 USE_LIBS += [
     'nspr',
     'zlib',
 ]
 
+if CONFIG['JS_BUILD_BINAST']:
+    USE_LIBS += [
+        'brotli',
+    ]
+
 if CONFIG['OS_ARCH'] not in ('WINNT', 'HP-UX'):
     OS_LIBS += [
         'm',
     ]
 
 if CONFIG['OS_ARCH'] == 'FreeBSD':
     OS_LIBS += [
         '-pthread',
--- a/js/src/make-source-package.sh
+++ b/js/src/make-source-package.sh
@@ -95,16 +95,17 @@ case $cmd in
         ${TOPSRCDIR}/memory/moz.build \
         ${TOPSRCDIR}/memory/build \
         ${TOPSRCDIR}/memory/fallible \
         ${TOPSRCDIR}/memory/mozalloc \
         ${tgtpath}/memory/
 
     ${MKDIR} -p ${tgtpath}/modules
     cp -pPR \
+        ${TOPSRCDIR}/modules/brotli \
         ${TOPSRCDIR}/modules/fdlibm \
         ${TOPSRCDIR}/modules/zlib \
         ${tgtpath}/modules/
 
     ${MKDIR} -p ${tgtpath}/mozglue
     cp -pPR \
         ${TOPSRCDIR}/mozglue/build \
         ${TOPSRCDIR}/mozglue/misc \