diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-29 21:57:36 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-30 11:13:30 +0300 |
| commit | 41c2fc546a96e7ea8b7850086cbeb072a989e395 (patch) | |
| tree | 85921bd4a84dea90cae31da0f23ad987a4f13c42 /external | |
| parent | 711abf15b1391a143998fbc0ec8c5b9378ac62f7 (diff) | |
Look for and deliver shared libgcc and libstdc++ for MinGW
Also remove mingwm10.dll stuff. That is an obsolete DLL not used by
current MinGW, says Fridrich.
Diffstat (limited to 'external')
| -rw-r--r-- | external/gcc3_specific/makefile.mk | 26 | ||||
| -rw-r--r-- | external/mingwm10/README_mingwm10.dll | 3 | ||||
| -rw-r--r-- | external/prj/d.lst | 1 |
3 files changed, 15 insertions, 15 deletions
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk index d40468c7118d..5d0fef848edd 100644 --- a/external/gcc3_specific/makefile.mk +++ b/external/gcc3_specific/makefile.mk @@ -11,10 +11,6 @@ TARGET=gcc3_specific .IF "$(GUI)" == "WNT" -.IF "$(CROSS_COMPILING)" != "YES" -# Don't do any of this weird and presumably obsolete crack when -# cross-compiling - .IF "$(COM)" == "GCC" .IF "$(MINGW_SHARED_GCCLIB)" == "YES" @@ -25,20 +21,28 @@ MINGWGCCDLL=$(BIN)$/$(MINGW_GCCDLL) MINGWGXXDLL=$(BIN)$/$(MINGW_GXXDLL) .ENDIF -all : $(BIN)$/mingwm10.dll $(MINGWGCCDLL) $(MINGWGXXDLL) +all : $(MINGWGCCDLL) $(MINGWGXXDLL) + +# Guesstimate where $(MINGW_GCCDLL) and $(MINGW_GXXDLL) might be -$(BIN)$/mingwm10.dll : - $(COPY) -p $(COMPATH)$/bin$/mingwm10.dll $(BIN)$/ +POTENTIAL_MINGW_RUNTIME_BINDIRS = \ + $(COMPATH)/i686-w64-mingw32/sys-root/mingw/bin \ + /usr/i686-w64-mingw32/sys-root/mingw/bin \ .IF "$(MINGW_SHARED_GCCLIB)" == "YES" $(MINGWGCCDLL) : - $(COPY) -p $(COMPATH)$/bin$/$(MINGW_GCCDLL) $(BIN)$/ + @for D in $(POTENTIAL_MINGW_RUNTIME_BINDIRS); do \ + test -f $$D/$(MINGW_GCCDLL) && $(COPY) -p $$D/$(MINGW_GCCDLL) $(BIN)$/ && break; \ + done + @test -f $@ || (echo Could not find $(MINGW_GCCDLL) && exit 1) .ENDIF -.IF "$(MINGW_SHARED_GXXLIB)" == "YES" $(MINGWGXXDLL) : - $(COPY) -p $(COMPATH)$/bin$/$(MINGW_GXXDLL) $(BIN)$/ -.ENDIF +.IF "$(MINGW_SHARED_GXXLIB)" == "YES" + @for D in $(POTENTIAL_MINGW_RUNTIME_BINDIRS); do \ + test -f $$D/$(MINGW_GXXDLL) && $(COPY) -p $$D/$(MINGW_GXXDLL) $(BIN)$/ && break; \ + done + @test -f $@ || (echo Could not find $(MINGW_GXXDLL) && exit 1) .ENDIF diff --git a/external/mingwm10/README_mingwm10.dll b/external/mingwm10/README_mingwm10.dll deleted file mode 100644 index 992e9b66cf97..000000000000 --- a/external/mingwm10/README_mingwm10.dll +++ /dev/null @@ -1,3 +0,0 @@ -Put the mingwm10.dll in this directory for Windows builds using -a MinGW compiler. The dlls are part of the MinGW installation and can be found -in the directory where the compiler binary is installed. diff --git a/external/prj/d.lst b/external/prj/d.lst index 38912108b156..b2edb8f3a647 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -48,7 +48,6 @@ mkdir: %_DEST%\inc\external\wine ..\vcredist\vcredist_x86.exe %_DEST%\bin\vcredist_x86.exe ..\vcredist\vcredist_x64.exe %_DEST%\bin\vcredist_x64.exe -..\%__SRC%\bin\mingwm10.dll %_DEST%\bin\mingwm10.dll ..\%__SRC%\bin\libgcc*.dll %_DEST%\bin\libgcc*.dll ..\%__SRC%\bin\libstdc++*.dll %_DEST%\bin\libstdc++*.dll |