[Libreoffice-commits] core.git: configure.ac

[Michael Stahl]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 36ce22f41a754fa405804434899a08a23081e721
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Aug 15 12:30:45 2014 +0200

    fdo#82430: MSVC 2010 refuses both -clr and -arch in the same command
    
    Change-Id: I41339e05ec914a2d660d87c99c99b824dddd10c9

diff --git a/configure.ac b/configure.ac
index 89d80e7..20e2405 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3773,7 +3773,7 @@ if test "$_os" = "WINNT"; then
                     COMPATH=`echo $VC_PRODUCT_DIR`
                 fi
             fi
-            if test "$BITNESS_OVERRIDE" = ""; then
+            if test "$BITNESS_OVERRIDE" = "" -a "$vcnum" != "100"; then
                 CC="$CC -arch:SSE" # MSVC 2012 default for x86 is -arch:SSE2
             fi
             export INCLUDE=`cygpath -d "$COMPATH/Include"`