[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - configure.ac external/liblangtag external/openssl solenv/gbuild solenv/gcc-wrappers
Michael Stahl
mstahl at redhat.com
Mon Aug 25 13:18:19 PDT 2014
configure.ac | 3 +++
external/liblangtag/ExternalProject_langtag.mk | 4 +++-
external/openssl/ExternalProject_openssl.mk | 2 +-
solenv/gbuild/platform/com_MSC_class.mk | 6 ++++--
solenv/gcc-wrappers/g++.cxx | 4 +++-
solenv/gcc-wrappers/gcc.cxx | 4 +++-
solenv/gcc-wrappers/wrapper.cxx | 5 ++++-
solenv/gcc-wrappers/wrapper.hxx | 2 +-
8 files changed, 22 insertions(+), 8 deletions(-)
New commits:
commit f83c7358964cf9f265f21e7dfa72e82a26923b3e
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Aug 8 14:58:08 2014 +0200
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 at googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/configure.ac b/configure.ac
index 809b353..02791ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3775,6 +3775,9 @@ if test "$_os" = "WINNT"; then
COMPATH=`echo $VC_PRODUCT_DIR`
fi
fi
+ 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"`
PathFormat "$COMPATH"
diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk
index c3d4115..8835bdf 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 12c7576..ea5f8b2 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 fb617ac..dec9e81 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -503,9 +503,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 d2ee3d5..626b164 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", true);
- 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 b8983cf..f34c2db 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", true);
- string args=processccargs(rawargs);
+ string args=flags.empty() ? string() : flags + " ";
+ args += processccargs(rawargs);
setupccenv();
diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index ba22e16..585a7df 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -15,11 +15,14 @@
#define BUFLEN 2048
-string getexe(string exename) {
+string getexe(string exename, bool maybeempty) {
char* cmdbuf;
size_t cmdlen;
_dupenv_s(&cmdbuf,&cmdlen,exename.c_str());
if(!cmdbuf) {
+ if (maybeempty) {
+ return string();
+ }
cout << "Error " << exename << " not defined. Did you forget to source the environment?" << endl;
exit(1);
}
diff --git a/solenv/gcc-wrappers/wrapper.hxx b/solenv/gcc-wrappers/wrapper.hxx
index 9850741..36baa08 100644
--- a/solenv/gcc-wrappers/wrapper.hxx
+++ b/solenv/gcc-wrappers/wrapper.hxx
@@ -13,7 +13,7 @@
using namespace std;
-string getexe(string exename);
+string getexe(string exename, bool maybeempty = false);
void setupccenv();
More information about the Libreoffice-commits
mailing list