b=1043075 revert to no hostbz2 when --with-system-bz2 r=glandium
authorKarl Tomlinson <karlt+@karlt.net>
Thu, 24 Jul 2014 12:36:32 +1200
changeset 196269 8206aeef0a844a52e317c8b6c9a243cca97dcaa5
parent 196268 f4477aa19a7238b6f9d12b0ece5d2603d16607d1
child 196270 fc1209c15663911cb3499d530f311258d760b81e
push id27208
push usercbook@mozilla.com
push dateMon, 28 Jul 2014 13:33:20 +0000
treeherdermozilla-central@70b3fc807a70 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1043075
milestone34.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
b=1043075 revert to no hostbz2 when --with-system-bz2 r=glandium
other-licenses/bsdiff/moz.build
--- a/other-licenses/bsdiff/moz.build
+++ b/other-licenses/bsdiff/moz.build
@@ -5,16 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 HOST_SOURCES += [
     'bsdiff.c',
 ]
 
 HOST_PROGRAM = 'mbsdiff'
 
-HOST_USE_LIBS += [
-    'hostbz2',
-]
+if not CONFIG['MOZ_NATIVE_BZ2']:
+    HOST_USE_LIBS += [
+        'hostbz2',
+    ]
 
 LOCAL_INCLUDES += [
     '/toolkit/mozapps/update/updater',
 ]