Bug 1277483 - Another followup to fix bustage.
☠☠ backed out by 15fb9fb5775c ☠ ☠
authorMs2ger <Ms2ger@gmail.com>
Tue, 07 Jun 2016 11:00:31 +0200
changeset 300861 6134b92d1b089f3a7d3e36025d52f491befb4ae1
parent 300860 34de8590421ffbe1862342ac2fac2a13f6992b25
child 300862 551541092f094b820fddf2f2a21771ef2141a606
push id19599
push usercbook@mozilla.com
push dateWed, 08 Jun 2016 10:16:21 +0000
treeherderfx-team@81f4cc3f6f4c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1277483
milestone50.0a1
Bug 1277483 - Another followup to fix bustage.
build/moz.configure/toolchain.configure
python/mozbuild/mozpack/executables.py
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -617,11 +617,12 @@ def enable_strip(value):
 set_config('ENABLE_STRIP', enable_strip)
 
 
 option('--disable-install-strip',
        help='Disable stripping of libs & executables when packaging')
 
 @depends('--disable-install-strip')
 def disable_install_strip(value):
-    return not value
+    if not value:
+        return True
 
 set_config('PKG_SKIP_STRIP', disable_install_strip)
--- a/python/mozbuild/mozpack/executables.py
+++ b/python/mozbuild/mozpack/executables.py
@@ -80,17 +80,17 @@ def is_executable(path):
     return get_type(path) != UNKNOWN
 
 
 def may_strip(path):
     '''
     Return whether strip() should be called
     '''
     from buildconfig import substs
-    return not substs['PKG_SKIP_STRIP']
+    return not substs.get('PKG_SKIP_STRIP')
 
 
 def strip(path):
     '''
     Execute the STRIP command with STRIP_FLAGS on the given path.
     '''
     from buildconfig import substs
     strip = substs['STRIP']