diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | external/liblangtag/ExternalProject_langtag.mk | 4 | ||||
| -rw-r--r-- | external/openssl/ExternalProject_openssl.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 6 | ||||
| -rw-r--r-- | solenv/gcc-wrappers/g++.cxx | 4 | ||||
| -rw-r--r-- | solenv/gcc-wrappers/gcc.cxx | 4 |
6 files changed, 17 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index e20f112953c8..89d80e7e9233 100644 --- a/configure.ac +++ b/configure.ac @@ -3773,6 +3773,9 @@ if test "$_os" = "WINNT"; then COMPATH=`echo $VC_PRODUCT_DIR` fi fi + if test "$BITNESS_OVERRIDE" = ""; then + CC="$CC -arch:SSE" # MSVC 2012 default for x86 is -arch:SSE2 + fi export INCLUDE=`cygpath -d "$COMPATH/Include"` PathFormat "$COMPATH" diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index c3d411509cc3..8835bdf001b2 100644 --- a/external/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk @@ -31,7 +31,9 @@ $(call gb_ExternalProject_get_state_target,langtag,build): $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \ - && $(if $(filter WNTMSC,$(OS)$(COM)),REAL_CC="$(shell cygpath -w $(lastword $(CC)))") \ + && $(if $(filter WNTMSC,$(OS)$(COM)),\ + REAL_CC="$(shell cygpath -w $(lastword $(filter-out -%,$(CC))))" \ + REAL_CC_FLAGS="$(filter -%,$(CC))") \ $(if $(VERBOSE)$(verbose),V=1) \ $(gb_Helper_set_ld_path) \ $(MAKE) \ diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index 12c757610ca5..ea5f8b22b1c8 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -61,7 +61,7 @@ OPENSSL_PLATFORM := \ ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,openssl,build): $(call gb_ExternalProject_run,build,\ - export CC="$(shell cygpath -w $(CC))" \ + export CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \ && export PERL="$(shell cygpath -w $(PERL))" \ && export LIB="$(ILIB)" \ && $(PERL) Configure $(OPENSSL_PLATFORM) no-idea \ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index f619aa71f8af..67bd4a5ba777 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -506,9 +506,11 @@ endef # /opt/lo/bin/ccache /cygdrive/c/PROGRA~2/MICROS~2.0/VC/bin/cl.exe gb_AUTOCONF_WRAPPERS = \ - REAL_CC="$(shell cygpath -w $(CC))" \ + REAL_CC="$(shell cygpath -w $(filter-out -%,$(CC)))" \ + REAL_CC_FLAGS="$(filter -%,$(CC))" \ CC="$(call gb_Executable_get_target,gcc-wrapper)" \ - REAL_CXX="$(shell cygpath -w $(CXX))" \ + REAL_CXX="$(shell cygpath -w $(filter-out -%,$(CXX)))" \ + REAL_CXX_FLAGS="$(filter -%,$(CXX))" \ CXX="$(call gb_Executable_get_target,g++-wrapper)" \ LD="$(shell cygpath -w $(COMPATH)/bin/link.exe) -nologo" diff --git a/solenv/gcc-wrappers/g++.cxx b/solenv/gcc-wrappers/g++.cxx index d2ee3d555e0a..289d91973221 100644 --- a/solenv/gcc-wrappers/g++.cxx +++ b/solenv/gcc-wrappers/g++.cxx @@ -13,8 +13,10 @@ int main(int argc, char *argv[]) { vector<string> rawargs(argv + 1, argv + argc); string command=getexe("REAL_CXX"); + string flags=getexe("REAL_CXX_FLAGS"); - string args=processccargs(rawargs); + string args=flags.empty() ? string() : flags + " "; + args += processccargs(rawargs); setupccenv(); diff --git a/solenv/gcc-wrappers/gcc.cxx b/solenv/gcc-wrappers/gcc.cxx index b8983cf6e5e6..8ff814856974 100644 --- a/solenv/gcc-wrappers/gcc.cxx +++ b/solenv/gcc-wrappers/gcc.cxx @@ -13,8 +13,10 @@ int main(int argc, char *argv[]) { vector<string> rawargs(argv + 1, argv + argc); string command=getexe("REAL_CC"); + string flags=getexe("REAL_CC_FLAGS"); - string args=processccargs(rawargs); + string args=flags.empty() ? string() : flags + " "; + args += processccargs(rawargs); setupccenv(); |