diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-06 12:30:20 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-06 12:30:20 +0100 |
| commit | e25ad543952b5afc13181aaebef9c5951fc27be0 (patch) | |
| tree | 456a1359b3e5f810319edd423dd5cc5a1e22ada5 /old-configure.in | |
| parent | 74533a843277c3687c749989ed1522354d1054d2 (diff) | |
| parent | 5dba1ebe8498286762873fff0016f35f3e14d2d5 (diff) | |
| download | UXP-e41749ff8b3b148b854a346ce2c6e6526caa1754.tar UXP-e41749ff8b3b148b854a346ce2c6e6526caa1754.tar.gz UXP-e41749ff8b3b148b854a346ce2c6e6526caa1754.tar.lz UXP-e41749ff8b3b148b854a346ce2c6e6526caa1754.tar.xz UXP-e41749ff8b3b148b854a346ce2c6e6526caa1754.zip | |
Merge branch 'master' into Basilisk-releasev2019.03.08
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/old-configure.in b/old-configure.in index eba476bd0..7fadc2302 100644 --- a/old-configure.in +++ b/old-configure.in @@ -215,11 +215,12 @@ case "$target" in # -Zc:sizedDealloc- disables C++14 global sized deallocation (see bug 1160146) CXXFLAGS="$CXXFLAGS -Zc:sizedDealloc-" - - # Disable C++11 thread-safe statics due to crashes on XP (bug 1204752) - # See https://connect.microsoft.com/VisualStudio/feedback/details/1789709/visual-c-2015-runtime-broken-on-windows-server-2003-c-11-magic-statics - CXXFLAGS="$CXXFLAGS -Zc:threadSafeInit-" - + + # C4752: We explicitly use AVX instructions in only some libs, not global + # This is a pointless "helpful warning" to use /arch:AVX which we don't want. + CFLAGS="$CFLAGS -wd4752" + CXXFLAGS="$CXXFLAGS -wd4752" + # https://connect.microsoft.com/VisualStudio/feedback/details/888527/warnings-on-dbghelp-h # for dbghelp.h, imagehlp.h, and shobj.h # C4091: 'typedef ': ignored on left of '' when no variable is declared @@ -3564,23 +3565,6 @@ AC_CHECK_PROGS(WGET, wget, "") AC_SUBST(WGET) dnl ======================================================== -dnl Maintenance Service -dnl ======================================================== - -MOZ_ARG_ENABLE_BOOL(maintenance-service, -[ --enable-maintenance-service Enable building of maintenanceservice], - MOZ_MAINTENANCE_SERVICE=1, - MOZ_MAINTENANCE_SERVICE= ) - -if test -n "$MOZ_MAINTENANCE_SERVICE"; then - if test "$OS_ARCH" = "WINNT"; then - AC_DEFINE(MOZ_MAINTENANCE_SERVICE) - else - AC_MSG_ERROR([Can only build with --enable-maintenance-service with a Windows target]) - fi -fi - -dnl ======================================================== dnl Bundled fonts on desktop platforms dnl ======================================================== @@ -5069,7 +5053,6 @@ AC_SUBST(MOZ_UNIVERSALCHARDET) AC_SUBST(ACCESSIBILITY) AC_SUBST(MOZ_SPELLCHECK) AC_SUBST(MOZ_ANDROID_ANR_REPORTER) -AC_SUBST(MOZ_MAINTENANCE_SERVICE) AC_SUBST(MOZ_VERIFY_MAR_SIGNATURE) AC_SUBST(MOZ_ENABLE_SIGNMAR) AC_SUBST(MOZ_UPDATER) |