Backed out changeset f3446f35deed (bug 1277483) for Windows 8 x64 opt Build bustage on a CLOSED TREE

build/moz.configure/old.configure

@@ -192,6 +192,7 @@ def old_configure_options(*options):
     '--enable-gps-debug',
     '--enable-hardware-aec-ns',
     '--enable-icf',
+    '--enable-install-strip',
     '--enable-ion',
     '--enable-ios-target',
     '--enable-ipdl-tests',
@@ -240,6 +241,7 @@ def old_configure_options(*options):
     '--enable-startup-notification',
     '--enable-startupcache',
     '--enable-stdcxx-compat',
+    '--enable-strip',
     '--enable-synth-pico',
     '--enable-synth-speechd',
     '--enable-system-cairo',

build/moz.configure/toolchain.configure

@@ -604,25 +604,3 @@ host_c_compiler = compiler('C', host, other_compiler=c_compiler)
 host_cxx_compiler = compiler('C++', host, c_compiler=host_c_compiler,
                              other_compiler=cxx_compiler,
                              other_c_compiler=c_compiler)
-
-
-option('--enable-strip',
-       help='Enable stripping of libs & executables')
-
-@depends('--enable-strip')
-def enable_strip(value):
-    if value:
-        return True
-
-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):
-    if not value:
-        return True
-
-set_config('PKG_SKIP_STRIP', disable_install_strip)

js/src/old-configure.in

@@ -2189,6 +2189,22 @@ if test -n "$SIXGILL_PATH"; then
 fi
 AC_SUBST(SIXGILL_PATH)
 
+dnl ========================================================
+dnl = Enable stripping of libs & executables
+dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(strip,
+[  --enable-strip          Enable stripping of libs & executables ],
+    ENABLE_STRIP=1,
+    ENABLE_STRIP= )
+
+dnl ========================================================
+dnl = Enable stripping of libs & executables when packaging
+dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(install-strip,
+[  --enable-install-strip  Enable stripping of libs & executables when packaging ],
+    PKG_SKIP_STRIP= ,
+    PKG_SKIP_STRIP=1)
+
 dnl ========================================================
 dnl =
 dnl = Profiling and Instrumenting
@@ -2440,6 +2456,8 @@ AC_SUBST(MOZ_DEBUG_LDFLAGS)
 AC_SUBST(WARNINGS_AS_ERRORS)
 AC_SUBST(LIBICONV)
 
+AC_SUBST(ENABLE_STRIP)
+AC_SUBST(PKG_SKIP_STRIP)
 AC_SUBST(INCREMENTAL_LINKER)
 
 AC_SUBST(MOZ_FIX_LINK_PATHS)

old-configure.in

@@ -5447,6 +5447,22 @@ dnl ========================================================
 
 MOZ_CONFIG_CLANG_PLUGIN
 
+dnl ========================================================
+dnl = Enable stripping of libs & executables
+dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(strip,
+[  --enable-strip          Enable stripping of libs & executables ],
+    ENABLE_STRIP=1,
+    ENABLE_STRIP= )
+
+dnl ========================================================
+dnl = Enable stripping of libs & executables when packaging
+dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(install-strip,
+[  --enable-install-strip  Enable stripping of libs & executables when packaging ],
+    PKG_SKIP_STRIP= ,
+    PKG_SKIP_STRIP=1)
+
 dnl ========================================================
 dnl = --disable-elf-hack
 dnl ========================================================
@@ -6491,6 +6507,8 @@ AC_SUBST(MOZ_ANDROID_BROWSER_INTENT_CLASS)
 AC_SUBST(MOZ_ANDROID_SEARCH_INTENT_CLASS)
 AC_SUBST(MOZ_EXCLUDE_HYPHENATION_DICTIONARIES)
 AC_SUBST(MOZ_INSTALL_TRACKING)
+AC_SUBST(ENABLE_STRIP)
+AC_SUBST(PKG_SKIP_STRIP)
 AC_SUBST(STRIP_FLAGS)
 AC_SUBST(USE_ELF_HACK)
 AC_SUBST(INCREMENTAL_LINKER)