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

diff --git a/rts/ghc.mk b/rts/ghc.mk
index ada683a..60fb620 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
@@ -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))