X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=mk%2Ftarget.mk;h=59223f6f39540d34cf7b292734c8e025628eee8c;hb=a48cb161bb6986a437c97c08b3bd1a3edbe8ba1d;hp=81ac73badfa4820c202bf84e5e26189eb1e37713;hpb=50027272414438955dbc41696541cbd25da55883;p=ghc-hetmet.git

diff --git a/mk/target.mk b/mk/target.mk
index 81ac73b..59223f6 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -293,8 +293,14 @@ boot :: depend
 ifneq "$(HS_PROG)" ""
 all :: $(HS_PROG)
 
+ifneq "$(BootingFromHc)" "YES"
 $(HS_PROG) :: $(HS_OBJS)
-	$(HC) -o $@ $(HC_OPTS) $(LD_OPTS) $(HS_OBJS) $(LIBS)
+	$(HC) -o $@ $(HC_OPTS) $(LD_OPTS) $(HS_OBJS)
+else
+# see bootstrp.mk
+$(HS_PROG) :: $(HS_OBJS)
+	$(CC) -o $@ $(HC_BOOT_CC_OPTS) $(HC_BOOT_LD_OPTS) $(HS_OBJS) $(HC_BOOT_LIBS)
+endif
 endif
 
 # Object and interface files have suffixes tagged with their ways
@@ -308,10 +314,6 @@ endif
 ifneq "$(C_PROG)" ""
 all :: $(C_PROG)
 
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-CC_OPTS += -mno-cygwin
-endif
-
 $(C_PROG) :: $(C_OBJS)
 	$(CC) -o $@ $(CC_OPTS) $(LD_OPTS) $(C_OBJS) $(LIBS)
 endif
@@ -699,6 +701,7 @@ $(LINK) : $(LINK_TARGET)
 # install links to script drivers.
 #
 install ::
+	@$(INSTALL_DIR) $(bindir)
 	@if ( $(PERL) -e '$$fn="$(bindir)/$(LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
 	   echo "Creating a symbol link from $(LINK_TARGET) to $(LINK) in $(bindir)"; \
 	   $(RM) $(bindir)/$(LINK); \