Fix path to windres on Win64
authorIan Lynagh <igloo@earth.li>
Fri, 16 Mar 2012 01:34:21 +0000 (01:34 +0000)
committerIan Lynagh <igloo@earth.li>
Fri, 16 Mar 2012 01:34:21 +0000 (01:34 +0000)
driver/ghci/ghc.mk
mk/config.mk.in

index 1d609c7..88c6aaf 100644 (file)
@@ -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)" $< $@
index 2b5bd46..2482da8 100644 (file)
@@ -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
 #