mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1121000 - Remove support for non-unified builds; r=gps
This commit is contained in:
parent
59d69bb40c
commit
5a04745802
@ -3,8 +3,6 @@ ac_add_options --enable-dmd
|
||||
ac_add_options --enable-signmar
|
||||
ac_add_options --with-google-oauth-api-keyfile=/builds/google-oauth-api.key
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
||||
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
. $topsrcdir/build/unix/mozconfig.linux32
|
||||
|
@ -1,5 +0,0 @@
|
||||
MOZ_AUTOMATION_UPLOAD=0
|
||||
|
||||
. "$topsrcdir/browser/config/mozconfigs/linux64/debug"
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
@ -7,8 +7,6 @@ MOZ_AUTOMATION_L10N_CHECK=0
|
||||
ac_add_options --enable-debug
|
||||
ac_add_options --enable-dmd
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
||||
|
||||
# Use Clang as specified in manifest
|
||||
export CC="$topsrcdir/clang/bin/clang"
|
||||
export CXX="$topsrcdir/clang/bin/clang++"
|
||||
|
@ -1,6 +0,0 @@
|
||||
MOZ_AUTOMATION_UPLOAD=0
|
||||
MOZ_AUTOMATION_PRETTY=1
|
||||
|
||||
. "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
@ -1,5 +0,0 @@
|
||||
MOZ_AUTOMATION_PRETTY=1
|
||||
MOZ_AUTOMATION_UPLOAD=0
|
||||
. "$topsrcdir/browser/config/mozconfigs/macosx-universal/nightly"
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
@ -5,8 +5,6 @@ ac_add_options --enable-debug
|
||||
ac_add_options --enable-optimize="-O1"
|
||||
ac_add_options --with-google-oauth-api-keyfile=/builds/google-oauth-api.key
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
||||
|
||||
# Package js shell.
|
||||
export MOZ_PACKAGE_JSSHELL=1
|
||||
|
||||
|
@ -1,4 +0,0 @@
|
||||
MOZ_AUTOMATION_UPLOAD=0
|
||||
. "$topsrcdir/browser/config/mozconfigs/macosx64/debug"
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
@ -1,6 +0,0 @@
|
||||
. "$topsrcdir/build/mozconfig.win-common"
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
MOZ_AUTOMATION_UPLOAD=0
|
||||
. "$topsrcdir/browser/config/mozconfigs/win32/debug"
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
@ -1,6 +0,0 @@
|
||||
. "$topsrcdir/build/mozconfig.win-common"
|
||||
MOZ_AUTOMATION_PRETTY=1
|
||||
MOZ_AUTOMATION_UPLOAD=0
|
||||
. "$topsrcdir/browser/config/mozconfigs/win32/nightly"
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
@ -1,3 +0,0 @@
|
||||
. "$topsrcdir/browser/config/mozconfigs/win64/debug"
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
@ -1,3 +0,0 @@
|
||||
. "$topsrcdir/browser/config/mozconfigs/win64/nightly"
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
11
configure.in
11
configure.in
@ -3542,17 +3542,6 @@ esac
|
||||
AC_SUBST(NIGHTLY_BUILD)
|
||||
AC_SUBST(RELEASE_BUILD)
|
||||
|
||||
dnl ========================================================
|
||||
dnl Disable compiling sources in unified mode.
|
||||
dnl ========================================================
|
||||
|
||||
MOZ_ARG_DISABLE_BOOL(unified-compilation,
|
||||
[ --disable-unified-compilation
|
||||
Disable unified compilation of some C/C++ sources],
|
||||
MOZ_DISABLE_UNIFIED_COMPILATION=1,
|
||||
MOZ_DISABLE_UNIFIED_COMPILATION=)
|
||||
AC_SUBST(MOZ_DISABLE_UNIFIED_COMPILATION)
|
||||
|
||||
dnl ========================================================
|
||||
dnl Multiprocess Firefox Nightly Testing UI
|
||||
dnl To be removed in Bug 1003313
|
||||
|
@ -2779,21 +2779,6 @@ esac
|
||||
AC_SUBST(NIGHTLY_BUILD)
|
||||
AC_SUBST(RELEASE_BUILD)
|
||||
|
||||
dnl ========================================================
|
||||
dnl Disable compiling sources in unified mode.
|
||||
dnl ========================================================
|
||||
|
||||
if test -z "$NIGHTLY_BUILD"; then
|
||||
MOZ_DISABLE_UNIFIED_COMPILATION=1
|
||||
fi
|
||||
|
||||
MOZ_ARG_DISABLE_BOOL(unified-compilation,
|
||||
[ --disable-unified-compilation
|
||||
Disable unified compilation of some C/C++ sources],
|
||||
MOZ_DISABLE_UNIFIED_COMPILATION=1,
|
||||
MOZ_DISABLE_UNIFIED_COMPILATION=)
|
||||
AC_SUBST(MOZ_DISABLE_UNIFIED_COMPILATION)
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = Check for external package dependencies
|
||||
|
@ -1,4 +0,0 @@
|
||||
. "$topsrcdir/mobile/android/config/mozconfigs/android-api-10/debug"
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
||||
|
@ -1,4 +0,0 @@
|
||||
. "$topsrcdir/mobile/android/config/mozconfigs/android-api-10/nightly"
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
||||
|
@ -1,4 +0,0 @@
|
||||
. "$topsrcdir/mobile/android/config/mozconfigs/android-api-11/debug"
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
||||
|
@ -1,4 +0,0 @@
|
||||
. "$topsrcdir/mobile/android/config/mozconfigs/android-api-11/nightly"
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
||||
|
@ -2,7 +2,6 @@
|
||||
|
||||
# Global options
|
||||
ac_add_options --enable-debug
|
||||
ac_add_options --disable-unified-compilation
|
||||
|
||||
# Android
|
||||
ac_add_options --target=arm-linux-androideabi
|
||||
|
@ -2,7 +2,6 @@
|
||||
|
||||
# Global options
|
||||
ac_add_options --enable-debug
|
||||
ac_add_options --disable-unified-compilation
|
||||
|
||||
# Android
|
||||
ac_add_options --target=i386-linux-android
|
||||
|
@ -1,3 +0,0 @@
|
||||
. "$topsrcdir/mobile/android/config/mozconfigs/android/debug"
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
@ -1,3 +0,0 @@
|
||||
. "$topsrcdir/mobile/android/config/mozconfigs/android/nightly"
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
@ -394,8 +394,7 @@ class RecursiveMakeBackend(CommonBackend):
|
||||
non_unified_var = var[len('UNIFIED_'):]
|
||||
|
||||
files_per_unification = obj.files_per_unified_file
|
||||
do_unify = not self.environment.substs.get(
|
||||
'MOZ_DISABLE_UNIFIED_COMPILATION') and files_per_unification > 1
|
||||
do_unify = files_per_unification > 1
|
||||
# Sorted so output is consistent and we don't bump mtimes.
|
||||
source_files = list(sorted(obj.files))
|
||||
|
||||
|
@ -5,5 +5,3 @@
|
||||
# This file is included at the top of all xulrunner mozconfigs
|
||||
|
||||
. "$topsrcdir/build/mozconfig.common"
|
||||
|
||||
ac_add_options --disable-unified-compilation
|
||||
|
Loading…
Reference in New Issue
Block a user