diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-22 10:53:50 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-22 10:53:50 +0300 |
| commit | 8c3740eb6e35a13a1ae24674fc4e93def976411d (patch) | |
| tree | dce9a97ed7e9a32ccd655a1d082ce8fce6cc99cb /external | |
| parent | f05f8318294f07957863b166ca316b8df1bcbd4e (diff) | |
Bypass some weird crack when cross-compiling with MinGW
Diffstat (limited to 'external')
| -rw-r--r-- | external/gcc3_specific/makefile.mk | 6 | ||||
| -rw-r--r-- | external/mingwheaders/makefile.mk | 6 |
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 |