X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=2ae4d72f4c89c9afab97cc6723a98841a0ec2736;hb=c8b84d15cea2869977a1248701f5ffa47e48d33e;hp=e4e9aad6abfde1cf34459bc65750a4240ec5a874;hpb=723eb70f31b2b413a51387bbbfbe01bb9b8c5907;p=ghc-hetmet.git

diff --git a/rts/ghc.mk b/rts/ghc.mk
index e4e9aad..2ae4d72 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -95,6 +95,8 @@ endif
 $(call distdir-way-opts,rts,dist,$1)
 $(call c-suffix-rules,rts,dist,$1,YES)
 $(call cmm-suffix-rules,rts,dist,$1)
+$(call hs-suffix-rules-srcdir,rts,dist,$1,$$(dir))
+# hs-suffix-rules-srcdir is needed when BootingFromHc to get the .hc rules
 
 rts_$1_LIB = rts/dist/build/libHSrts$$($1_libsuf)
 
@@ -114,7 +116,7 @@ $$(rts_$1_LIB) : $$(rts_$1_OBJS) rts/libs.depend
 else
 $$(rts_$1_LIB) : $$(rts_$1_OBJS)
 	"$$(RM)" $$(RM_OPTS) $$@
-	echo $$(rts_$1_OBJS) | $$(XARGS) "$$(AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@
+	echo $$(rts_$1_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@
 endif
 
 endef
@@ -361,9 +363,9 @@ install : install_rts
 
 .PHONY: install_rts
 install_rts:
-	$(INSTALL_DIR) $(DESTDIR)$(ghclibdir)
-	$(INSTALL_DIR) $(DESTDIR)$(ghclibdir)/include
-	"$(CP)" $(ALL_RTS_LIBS) $(DESTDIR)$(ghclibdir)
+	$(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)"
+	$(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)/include"
+	"$(CP)" $(ALL_RTS_LIBS) "$(DESTDIR)$(ghclibdir)"
 
 # -----------------------------------------------------------------------------
 # cleaning