summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--external/gcc3_specific/makefile.mk6
-rw-r--r--external/mingwheaders/makefile.mk6
2 files changed, 12 insertions, 0 deletions
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
index 952b9b97855f..741288c37e13 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 ccfc9587462c..83d9011dbac8 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