summaryrefslogtreecommitdiff
path: root/rules/build-package-way.mk
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2010-06-22 20:25:47 +0000
committerIan Lynagh <igloo@earth.li>2010-06-22 20:25:47 +0000
commit8e79caf4a4755647c158df024781f8d77fa42a23 (patch)
tree13d7a14ca5eedbd9a9afcfccf6b5b5f08bd52761 /rules/build-package-way.mk
parentbc554287232d53d7f7dfbcb6de925b57fc877a0c (diff)
downloadhaskell-8e79caf4a4755647c158df024781f8d77fa42a23.tar.gz
Don't rely on "-packagefoo" working; use "-package foo" instead
Diffstat (limited to 'rules/build-package-way.mk')
-rw-r--r--rules/build-package-way.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk
index a128c4fd43..a1930b143b 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