[Libreoffice-commits] .: external/gcc3_specific external/mingwheaders

[Tor Lillqvist]

 external/gcc3_specific/makefile.mk |    6 ++++++
 external/mingwheaders/makefile.mk  |    6 ++++++
 2 files changed, 12 insertions(+)

New commits:
commit 60eb0c9aa0442a69e27fcdd49774d98f33a0db7d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun May 22 10:53:50 2011 +0300

    Bypass some weird crack when cross-compiling with MinGW

diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
index 952b9b9..741288c 100644
--- a/external/gcc3_specific/makefile.mk
+++ b/external/gcc3_specific/makefile.mk
@@ -11,6 +11,10 @@ TARGET=gcc3_specific
 
 .IF "$(GUI)" == "WNT"
 
+.IF "$(CROSS_COMPILING)" == ""
+# Don't do any of this weird and presumably obsolete crack when
+# cross-compiling
+
 .IF "$(COM)" == "GCC"
 
 .IF "$(MINGW_SHARED_GCCLIB)" == "YES"
@@ -38,6 +42,8 @@ $(MINGWGXXDLL) :
 
 .ENDIF
 
+.ENDIF
+
 .ELSE
 
 .IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3"
diff --git a/external/mingwheaders/makefile.mk b/external/mingwheaders/makefile.mk
index ccfc958..83d9011 100644
--- a/external/mingwheaders/makefile.mk
+++ b/external/mingwheaders/makefile.mk
@@ -33,6 +33,10 @@ TARGET=mingwheaders
 
 .IF "$(OS)$(COM)" == "WNTGCC"
 
+.IF "$(CROSS_COMPILING)" == ""
+# Don't do any of this weird and presumably obsolete crack when
+# cross-compiling
+
 # Cygwin and MinGW use different directories for the W32API headers
 .IF "$(USE_MINGW)" == "cygwin"
 MINGW_INCLUDE_DIR=$/usr$/include/mingw/
@@ -206,5 +210,7 @@ clean:
 
 .ENDIF
 
+.ENDIF
+
 .INCLUDE :  target.mk