Bug 1277483 - Move --enable-strip and --enable-install-strip to moz.configure; r=glandium

This commit is contained in:
Ms2ger 2016-06-03 11:11:40 +02:00
parent d6c0343e48
commit 607905c151
4 changed files with 22 additions and 38 deletions

View File

@ -192,7 +192,6 @@ 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',
@ -241,7 +240,6 @@ def old_configure_options(*options):
'--enable-startup-notification',
'--enable-startupcache',
'--enable-stdcxx-compat',
'--enable-strip',
'--enable-synth-pico',
'--enable-synth-speechd',
'--enable-system-cairo',

View File

@ -604,3 +604,25 @@ 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('--enable-install-strip',
help='Enable stripping of libs & executables when packaging')
@depends('--enable-install-strip')
def disable_install_strip(value):
if not value:
return True
set_config('PKG_SKIP_STRIP', disable_install_strip)

View File

@ -2194,22 +2194,6 @@ 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
@ -2462,8 +2446,6 @@ 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)

View File

@ -5477,22 +5477,6 @@ 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 ========================================================
@ -6538,8 +6522,6 @@ 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)