diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2011-05-06 12:00:53 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-05-09 10:50:42 +0100 |
| commit | 37a6a52facd1c3999ce4472c50b0030568be1e04 (patch) | |
| tree | 293bbdd7eb322c756e594b7faa70e8c3ac13e1d2 /rules | |
| parent | d45197aabb22178066a8ec50d29331786a0c518c (diff) | |
| download | haskell-37a6a52facd1c3999ce4472c50b0030568be1e04.tar.gz | |
Add $$($1_$2_$3_ALL_HC_OPTS) when linking dynamic libraries. Not
having this meant we weren't getting -no-user-package-conf, which
caused a build failure for me due to locally-installed packages being
used instead of ones in the tree.
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-package-way.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index a7dc9182a0..2497e298c2 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -64,17 +64,17 @@ ifeq "$3" "dyn" # On windows we have to supply the extra libs this one links to when building it. ifeq "$$(HOSTPLATFORM)" "i386-unknown-mingw32" $$($1_$2_$3_LIB) : $$($1_$2_$3_ALL_OBJS) $$(ALL_RTS_LIBS) $$($1_$2_$3_DEPS_LIBS) - "$$($1_$2_HC)" $$($1_$2_$3_ALL_OBJS) \ + "$$($1_$2_HC)" $$($1_$2_$3_ALL_HC_OPTS) $$($1_$2_$3_ALL_OBJS) \ -shared -dynamic -dynload deploy \ $$(addprefix -l,$$($1_$2_EXTRA_LIBRARIES)) \ - -no-auto-link-packages $$(addprefix -package ,$$($1_$2_DEPS)) \ + -no-auto-link-packages \ -o $$@ else $$($1_$2_$3_LIB) : $$($1_$2_$3_ALL_OBJS) $$(ALL_RTS_LIBS) $$($1_$2_$3_DEPS_LIBS) - "$$($1_$2_HC)" $$($1_$2_$3_ALL_OBJS) \ + "$$($1_$2_HC)" $$($1_$2_$3_ALL_HC_OPTS) $$($1_$2_$3_ALL_OBJS) \ -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 \ -o $$@ endif else |