X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=a667ac35530e42251c18f9a0ca87aaee2fb1cbc1;hb=a02e7f40afc1aab7fe466f949f505c1d7250713d;hp=ada683a21ab8d417dd0bb2137b754c87dfb31520;hpb=f84a0b7028424ea167658c06e75e871198371f00;p=ghc-hetmet.git

diff --git a/rts/ghc.mk b/rts/ghc.mk
index ada683a..a667ac3 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -72,7 +72,7 @@ rts_H_FILES = $(wildcard includes/*.h) $(wildcard rts/*.h)
 # collect the -l flags that we need to link the rts dyn lib.
 rts/libs.depend : $(GHC_PKG_INPLACE)
 	"$(GHC_PKG_INPLACE)" field rts extra-libraries \
-	  | sed -e 's/^extra-libraries: //' -e 's/\([a-z]*\)/-l\1/g' > $@
+	  | sed -e 's/^extra-libraries: //' -e 's/\([a-z0-9]*\)[ ]*/-l\1 /g' > $@
 
 #-----------------------------------------------------------------------------
 # Building one way
@@ -114,7 +114,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) $$(EXTRA_AR_ARGS) $$@
+	echo $$(rts_$1_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@
 endif
 
 endef
@@ -171,12 +171,6 @@ ifeq "$(UseLibFFIForAdjustors)" "YES"
 rts_CC_OPTS += -DUSE_LIBFFI_FOR_ADJUSTORS
 endif
 
-ifneq "$(DYNAMIC_RTS)" "YES"
-rts_HC_OPTS += -static
-else
-$(error ToDo: DYNAMIC_RTS)
-endif
-
 # Mac OS X: make sure we compile for the right OS version
 rts_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
 rts_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
@@ -340,7 +334,7 @@ $(DYNWRAPPER_PROG): $(DYNWRAPPER_SRC)
 # build the static lib containing the C main symbol
 
 rts/dist/build/libHSrtsmain.a : rts/dist/build/Main.o
-	$(AR) $(EXTRA_AR_ARGS) $@ $<
+	"$(AR)" $(AR_OPTS) $(EXTRA_AR_ARGS) $@ $<
 
 # -----------------------------------------------------------------------------
 # The RTS package config
@@ -367,9 +361,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