X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package-way.mk;h=a1930b143bf7bf5bc512397776a88c3c44673b3d;hb=dbd4b5697ca01d0c629511b9ff533fd487a2e919;hp=d66ed7c520446d3375945bd24ecc237f062b6fbe;hpb=9377b2d902d10df32596cd28f9814abb1a619262;p=ghc-hetmet.git

diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk
index d66ed7c..a1930b1 100644
--- a/rules/build-package-way.mk
+++ b/rules/build-package-way.mk
@@ -60,7 +60,7 @@ $$($1_$2_$3_LIB) : $$($1_$2_$3_ALL_OBJS) $$(ALL_RTS_LIBS) $$($1_$2_$3_DEPS_LIBS)
          `$$($1_$2_$3_MKSTUBOBJS)` \
          -shared -dynamic -dynload deploy \
 	 $$(addprefix -l,$$($1_$2_EXTRA_LIBRARIES)) \
-         -no-auto-link-packages $$(addprefix -package,$$($1_$2_DEPS)) \
+         -no-auto-link-packages $$(addprefix -package ,$$($1_$2_DEPS)) \
          -o $$@
 else
 $$($1_$2_$3_LIB) : $$($1_$2_$3_ALL_OBJS) $$(ALL_RTS_LIBS) $$($1_$2_$3_DEPS_LIBS)
@@ -68,7 +68,7 @@ $$($1_$2_$3_LIB) : $$($1_$2_$3_ALL_OBJS) $$(ALL_RTS_LIBS) $$($1_$2_$3_DEPS_LIBS)
          `$$($1_$2_$3_MKSTUBOBJS)` \
          -shared -dynamic -dynload deploy \
 	     -dylib-install-name $(ghclibdir)/`basename "$$@" | sed 's/^libHS//;s/[-]ghc.*//'`/`basename "$$@"` \
-         -no-auto-link-packages $$(addprefix -package,$$($1_$2_DEPS)) \
+         -no-auto-link-packages $$(addprefix -package ,$$($1_$2_DEPS)) \
          -o $$@
 endif
 else
@@ -81,7 +81,7 @@ ifeq "$$($1_$2_SplitObjs)" "YES"
 else
 	echo $$($1_$2_$3_ALL_OBJS) `$$($1_$2_$3_MKSTUBOBJS)` >> $$@.contents
 endif
-ifeq "$$(ArIsGNUAr)" "YES"
+ifeq "$$(ArSupportsAtFile)" "YES"
 	"$$(AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@ @$$@.contents
 else
 	"$$(XARGS)" $$(XARGS_OPTS) "$$(AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@ < $$@.contents