diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-03-16 01:34:21 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-03-16 01:34:21 +0000 |
| commit | 1f046163171fd064ce1211f41896614cf48a3752 (patch) | |
| tree | d804414c895f36ba6e3cdc91c84abca92ac272a9 | |
| parent | ca0fcb34d1e246b761f146da77a5bd12b7d2b4b1 (diff) | |
| download | haskell-1f046163171fd064ce1211f41896614cf48a3752.tar.gz | |
Fix path to windres on Win64
| -rw-r--r-- | driver/ghci/ghc.mk | 2 | ||||
| -rw-r--r-- | mk/config.mk.in | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk index 1d609c7949..88c6aafeca 100644 --- a/driver/ghci/ghc.mk +++ b/driver/ghci/ghc.mk @@ -41,7 +41,7 @@ driver/ghci_dist_PROG_VER = ghci-$(ProjectVersion)$(exeext) INSTALL_BINS += driver/ghci/dist/build/tmp/$(driver/ghci_dist_PROG_VER) driver/ghci/ghci.res : driver/ghci/ghci.rc driver/ghci/ghci.ico - $(INPLACE_MINGW)/bin/windres --preprocessor="$(CPP) -xc -DRC_INVOKED" -o driver/ghci/ghci.res -i driver/ghci/ghci.rc -O coff + "$(WINDRES)" --preprocessor="$(CPP) -xc -DRC_INVOKED" -o driver/ghci/ghci.res -i driver/ghci/ghci.rc -O coff driver/ghci/dist/build/tmp/$(driver/ghci_dist_PROG_VER) : driver/ghci/dist/build/tmp/$(driver/ghci_dist_PROG) "$(CP)" $< $@ diff --git a/mk/config.mk.in b/mk/config.mk.in index 2b5bd46aba..2482da869d 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -622,6 +622,12 @@ ifeq "$(CrossCompiling)" "YES" SRC_HSC2HS_OPTS += --cross-compile endif +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +WINDRES = $(INPLACE_MINGW)/bin/windres +else ifeq "$(TARGETPLATFORM)" "x86_64-unknown-mingw32" +WINDRES = $(INPLACE_MINGW)/bin/x86_64-w64-mingw32-windres +endif + #----------------------------------------------------------------------------- # Mingwex Library # |