diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-05-06 10:43:24 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-05-07 10:58:53 +0200 |
| commit | 75edcfc0569ca76fa22db451fd61138e52870a62 (patch) | |
| tree | 80cbfa96dc4267a5c0f1e06690f574c06e88dc7d /configure.ac | |
| parent | a638c73fcfc4480d652ba86754a3f96c693f8e12 (diff) | |
no longer force -arch:SSE on Windows
SSE2 has been pretty much a requirement for running Windows since
about 2018, so there should be ~nobody needing this.
https://lists.freedesktop.org/archives/libreoffice/2020-May/085029.html
Change-Id: I579eb92c18e42c57aa1421b889cfa7997b84915f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93558
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 0297a5e4a6ca..762e43987656 100644 --- a/configure.ac +++ b/configure.ac @@ -3559,10 +3559,6 @@ if test "$_os" = "WINNT"; then CC=$MSVC_CXX CC_BASE=`first_arg_basename "$CC"` fi - if test "$BITNESS_OVERRIDE" = ""; then - dnl since MSVC 2012, default for x86 is -arch:SSE2: - MSVC_CXX="$MSVC_CXX -arch:SSE" - fi if test -z "$CXX"; then CXX=$MSVC_CXX CXX_BASE=`first_arg_basename "$CXX"` @@ -3578,10 +3574,6 @@ if test "$_os" = "WINNT"; then COMPATH=$VC_PRODUCT_DIR fi fi - if test "$BITNESS_OVERRIDE" = ""; then - dnl since MSVC 2012, default for x86 is -arch:SSE2: - CC="$CC -arch:SSE" - fi COMPATH="$COMPATH/Tools/MSVC/$vcbuildnumber" @@ -6850,8 +6842,7 @@ else # MSVC seems to differentiate only between SSE and SSE2, where in fact # SSE2 seems to be SSE2+. # Even if -arch:SSE2 is the default, set it explicitly, so that the variable - # is not empty (and can be tested in gbuild), moreover we now default to SSE - # for 32bit x86. + # is not empty (and can be tested in gbuild). flag_sse2=-arch:SSE2 flag_ssse3=-arch:SSE2 flag_sse41=-arch:SSE2 @@ -11153,9 +11144,9 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE; then AC_MSG_CHECKING([for clang-cl]) if test -x "$VC_PRODUCT_DIR/Tools/Llvm/bin/clang-cl.exe"; then CLANG_CC=`win_short_path_for_make "$VC_PRODUCT_DIR/Tools/Llvm/bin/clang-cl.exe"` - dnl match our MSVC default, also explicitly set -m32/-m64 + dnl explicitly set -m32/-m64 if test "$BITNESS_OVERRIDE" = ""; then - CLANG_CC="$CLANG_CC -m32 -arch:SSE" + CLANG_CC="$CLANG_CC -m32" else CLANG_CC="$CLANG_CC -m64" fi |