Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/1f046163171fd064ce1211f41896614cf48a3752 >--------------------------------------------------------------- commit 1f046163171fd064ce1211f41896614cf48a3752 Author: Ian Lynagh <[email protected]> Date: Fri Mar 16 01:34:21 2012 +0000 Fix path to windres on Win64 >--------------------------------------------------------------- driver/ghci/ghc.mk | 2 +- 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 1d609c7..88c6aaf 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 2b5bd46..2482da8 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 # _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
