diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-08-08 14:58:08 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2014-08-26 01:10:23 +0200 |
| commit | 31c1ceaf50f911b5ea22a1f7770b961343483230 (patch) | |
| tree | 87dcac6a8e47225b7ffaa8c769496883961a1e8b /external/openssl | |
| parent | 2d32d70f646e04c28d44fabd9e77d56a812d2aec (diff) | |
fdo#82430: configure: MSVC build: avoid using SSE2 instructions
MSVC 2012 for x86 defaults to -arch:SSE2; binaries do not run on any AMD
32-bit CPU, neither on Intel Pentium III.
http://msdn.microsoft.com/en-us/library/vstudio/7t5yh4fd%28v=vs.110%29.aspx
(cherry picked from commit 8bd6bf93b7711a7ac7c5cbd7c3bb980481570ebd)
fdo#82430: MSVC 2010 refuses both -clr and -arch in the same command
(cherry picked from commit 36ce22f41a754fa405804434899a08a23081e721)
fdo#82430: gcc-wrappers: don't stop if REAL_CXX_FLAGS is empty
Hopefully should fix MSVC 2010 build...
(cherry picked from commit a18ff3d5c75c2b468c48bd19439dee0689d24d67)
Change-Id: Ie8253137db2699f2a7fa69c4ac4e7ded90931e3e
Reviewed-on: https://gerrit.libreoffice.org/10925
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit f83c7358964cf9f265f21e7dfa72e82a26923b3e)
Diffstat (limited to 'external/openssl')
| -rw-r--r-- | external/openssl/ExternalProject_openssl.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ |