Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/37a6a52facd1c3999ce4472c50b0030568be1e04 >--------------------------------------------------------------- commit 37a6a52facd1c3999ce4472c50b0030568be1e04 Author: Simon Marlow <[email protected]> Date: Fri May 6 12:00:53 2011 +0100 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. >--------------------------------------------------------------- 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 a7dc918..2497e29 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 _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
