Commit cab23e6d authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1641783 - Move MOZ_FOLD_LIBS to python configure. r=froydnj

Also remove MOZ_FOLD_LIBS_FLAGS because it is always empty since bug 1577521.

Differential Revision: https://phabricator.services.mozilla.com/D77410
parent 10b74a90
......@@ -1399,15 +1399,6 @@ dnl =
dnl ========================================================
MOZ_ARG_HEADER(External Packages)
case "$OS_TARGET" in
WINNT|Darwin|Android)
MOZ_FOLD_LIBS=1
;;
*)
MOZ_FOLD_LIBS=
;;
esac
MOZ_CONFIG_NSPR()
dnl ========================================================
......@@ -2953,8 +2944,6 @@ AC_SUBST(WIN32_GUI_EXE_LDFLAGS)
AC_SUBST(MOZ_DEVTOOLS)
AC_SUBST(MOZ_PACKAGE_JSSHELL)
AC_SUBST(MOZ_FOLD_LIBS)
AC_SUBST_LIST(MOZ_FOLD_LIBS_FLAGS)
AC_SUBST(DMG_TOOL)
......
......@@ -136,8 +136,6 @@ if CONFIG['OS_TARGET'] == 'WINNT':
if CONFIG['CPU_ARCH'] == 'x86':
# This should really be the default.
sandbox_vars['ASFLAGS'] = ['-safeseh']
if CONFIG['MOZ_FOLD_LIBS_FLAGS']:
sandbox_vars['CFLAGS'] += CONFIG['MOZ_FOLD_LIBS_FLAGS']
if CONFIG['OS_TARGET'] == 'Android':
sandbox_vars['CFLAGS'] = [
'-include', TOPSRCDIR + '/security/manager/android_stub.h',
......
......@@ -50,6 +50,12 @@ def all_configure_options():
set_config('MOZ_CONFIGURE_OPTIONS', all_configure_options)
@depends(target)
def fold_libs(target):
return target.os in ('WINNT', 'OSX', 'Android')
set_config('MOZ_FOLD_LIBS', fold_libs)
# Profiling
# ==============================================================
# Some of the options here imply an option from js/moz.configure,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment