X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=981fec0d8c52026d82e73e0e9a79cbcd4927f3bd;hb=12ee8b3dcf37a2f6974167886e17ae2e03c9cd72;hp=a2337f007d7356a383a8d5306b5599ea5b843be1;hpb=fdf1cd0399158308769fcb2ab7e46e215a68d865;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index a2337f0..981fec0 100644
--- a/Makefile
+++ b/Makefile
@@ -120,6 +120,28 @@ bootstrap2 : stage1
 bootstrap3 : bootstrap2
 	$(MAKE) stage3
 
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifneq "$(WhatGccIsCalled)" ""
+all :: stamp.inplace-gcc-lib
+
+.PHONY: stamp.inplace-gcc-lib
+
+# This is a hack to make Cabal able to find ld when we run tests with
+# the inplace ghc. We should probably install all the gcc stuff in our
+# tree somewhere, and then have install copy it from there rather than
+# from the filesystem.
+stamp.inplace-gcc-lib:
+	$(RM) -r compiler/gcc-lib
+	mkdir compiler/gcc-lib
+	cp $(GccDir)ld.exe compiler/gcc-lib
+	touch $@
+
+clean ::
+	$(RM) -r compiler/gcc-lib
+	$(RM) -f inplace-gcc-lib
+endif
+endif
+
 all :: bootstrap
 
 # -----------------------------------------------------------------------------
@@ -225,6 +247,10 @@ binary-dist::
 binary-dist::
 	cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
 
+binary-dist::
+	$(MKDIRHIER) $(BIN_DIST_DIR)/icons
+	cp distrib/hsicon.ico $(BIN_DIST_DIR)/icons
+
 else
 
 BinDistDirs = includes compiler docs rts
@@ -293,12 +319,6 @@ binary-dist::
 	$(MV) $(BIN_DIST_DIR)/configure-bin.ac $(BIN_DIST_DIR)/configure.ac
 	( cd $(BIN_DIST_DIR); autoreconf )
 
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-binary-dist::
-	$(MKDIRHIER) $(BIN_DIST_DIR)/icons
-	cp distrib/hsicon.ico $(BIN_DIST_DIR)/icons
-endif
-
 #
 # binary dist'ing the documentation.  
 # The default documentation to build/install is given below; overrideable