diff options
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 64 |
1 files changed, 9 insertions, 55 deletions
diff --git a/old-configure.in b/old-configure.in index ade675e95..c06687f14 100644 --- a/old-configure.in +++ b/old-configure.in @@ -961,16 +961,10 @@ case "$target" in CXXFLAGS="$CXXFLAGS -utf-8" fi if test "$CPU_ARCH" = "x86"; then - dnl VS2012+ defaults to -arch:SSE2. We want to target nothing - dnl more recent, so set that explicitly here unless another - dnl target arch has already been set. changequote(,) - if test -z `echo $CFLAGS | grep -i [-/]arch:`; then - CFLAGS="$CFLAGS -arch:SSE2" - fi - if test -z `echo $CXXFLAGS | grep -i [-/]arch:`; then - CXXFLAGS="$CXXFLAGS -arch:SSE2" - fi + dnl VS2012+ defaults to -arch:SSE2. We want to target nothing + dnl more recent, so no need to set it explicitly in the default + dnl case. changequote([,]) SSE_FLAGS="-arch:SSE" SSE2_FLAGS="-arch:SSE2" @@ -1086,15 +1080,15 @@ case "$target" in WARNINGS_AS_ERRORS='-WX' MOZ_OPTIMIZE_FLAGS='-O1 -Oi' MOZ_FIX_LINK_PATHS= - LDFLAGS="$LDFLAGS -LARGEADDRESSAWARE -NXCOMPAT" + num_cores=$($PYTHON -c 'import multiprocessing; print(min(8,multiprocessing.cpu_count()))') + cgthreads="-CGTHREADS:${num_cores}" + LDFLAGS="$LDFLAGS -LARGEADDRESSAWARE -NXCOMPAT -DYNAMICBASE -OPT:REF -OPT:ICF=${num_cores} $cgthreads" if test -z "$DEVELOPER_OPTIONS"; then LDFLAGS="$LDFLAGS -RELEASE" fi dnl For profile-guided optimization PROFILE_GEN_CFLAGS="-GL" - num_cores=$($PYTHON -c 'import multiprocessing; print(min(8,multiprocessing.cpu_count()))') - cgthreads="-CGTHREADS:${num_cores}" - PROFILE_GEN_LDFLAGS="-LTCG:PGINSTRUMENT -PogoSafeMode $cgthreads" + PROFILE_GEN_LDFLAGS="-LTCG:PGINSTRUMENT" dnl XXX: PGO builds can fail with warnings treated as errors, dnl specifically "no profile data available" appears to be dnl treated as an error sometimes. This might be a consequence @@ -1105,19 +1099,11 @@ case "$target" in PROFILE_USE_CFLAGS="-GL -wd4624 -wd4952" dnl XXX: should be -LTCG:PGOPTIMIZE, but that fails on libxul. dnl Probably also a compiler bug, but what can you do? - PROFILE_USE_LDFLAGS="-LTCG:PGUPDATE $cgthreads" - LDFLAGS="$LDFLAGS -DYNAMICBASE" + PROFILE_USE_LDFLAGS="-LTCG:PGUPDATE" RCFLAGS="-nologo" - if test "$CC_VERSION" = "18.00.31101"; then - dnl Use MaxILKSize as a workaround for LNK1248 in VS2013update4 - dnl See https://connect.microsoft.com/VisualStudio/feedback/details/1044914/fatal-error-lnk1248 - LDFLAGS="$LDFLAGS -MaxILKSize:0x7FF00000" - fi - dnl Minimum reqiurement of Gecko is VS2010 or later which supports - dnl both SSSE3 and SSE4.1. + dnl Minimum required VS version supports SSSE3, SSE4.1 and AVX2. HAVE_TOOLCHAIN_SUPPORT_MSSSE3=1 HAVE_TOOLCHAIN_SUPPORT_MSSE4_1=1 - dnl allow AVX2 code from VS2012 HAVE_X86_AVX2=1 fi AC_DEFINE(WIN32_LEAN_AND_MEAN) @@ -2149,7 +2135,6 @@ MOZ_NECKO_WIFI=1 NECKO_COOKIES=1 MOZ_USE_NATIVE_POPUP_WINDOWS= MOZ_EXCLUDE_HYPHENATION_DICTIONARIES= -MOZ_INSTALL_TRACKING= ACCESSIBILITY=1 MOZ_TIME_MANAGER= MOZ_AUDIO_CHANNEL_MANAGER= @@ -2185,22 +2170,6 @@ case "${target}" in esac -# Optional Firefox for Android partner distribution directory. -MOZ_ARG_WITH_STRING(android-distribution-directory, -[ --with-android-distribution-directory=dir - Optional Firefox for Android partner distribution directory.], - MOZ_ANDROID_DISTRIBUTION_DIRECTORY=$withval) - -if test -n "$MOZ_ANDROID_DISTRIBUTION_DIRECTORY"; then - # A distribution directory must have an assets/distribution directory. - # See https://wiki.mozilla.org/Mobile/Distribution_Files. - if test ! -d "$MOZ_ANDROID_DISTRIBUTION_DIRECTORY/assets/distribution" ; then - AC_MSG_ERROR([--with-android-distribution-directory does not contain assets/distribution; - (looked for ${MOZ_ANDROID_DISTRIBUTION_DIRECTORY}/assets/distribution).]) - fi -fi -AC_SUBST(MOZ_ANDROID_DISTRIBUTION_DIRECTORY) - dnl ======================================================== dnl = Vendor override dnl ======================================================== @@ -2250,11 +2219,6 @@ if test -n "$WITH_APP_BASENAME" ; then MOZ_APP_BASENAME="$WITH_APP_BASENAME" fi -# Graphene is a desktop runtime for running applications with a HTML UI. -if test -n "$MOZ_GRAPHENE"; then - AC_DEFINE(MOZ_GRAPHENE) -fi - dnl ======================================================== dnl Ensure Android SDK and build-tools versions depending on dnl mobile target. @@ -2633,15 +2597,6 @@ if test -n "$MOZ_EXCLUDE_HYPHENATION_DICTIONARIES"; then fi dnl ======================================================== -dnl = Include install tracking on Android -dnl ======================================================== -if test -n "$MOZ_INSTALL_TRACKING"; then - if test -z "$MOZ_ADJUST_SDK_KEY"; then - AC_MSG_ERROR([Must specify --with-adjust-sdk-keyfile when MOZ_INSTALL_TRACKING is defined!]) - fi -fi - -dnl ======================================================== dnl accessibility support on by default on all platforms dnl ======================================================== MOZ_ARG_DISABLE_BOOL(accessibility, @@ -4994,7 +4949,6 @@ AC_SUBST(MOZ_ANDROID_APPLICATION_CLASS) 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) |