Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/0ffc2b29dceab32c808b6e5a7232859711385a18 >--------------------------------------------------------------- commit 0ffc2b29dceab32c808b6e5a7232859711385a18 Author: Ian Lynagh <[email protected]> Date: Fri Oct 14 16:11:10 2011 +0100 Fix libffi build on Windows >--------------------------------------------------------------- rts/ghc.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rts/ghc.mk b/rts/ghc.mk index 767194e..a007f1a 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -172,10 +172,10 @@ rts_dist_$1_CC_OPTS += -DRtsWay=\"rts_$1\" # Making a shared library for the RTS. ifneq "$$(findstring dyn, $1)" "" ifeq "$$(HOSTPLATFORM)" "i386-unknown-mingw32" -$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend $$(rts_ffi_objs_stamp) +$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend "$$(RM)" $$(RM_OPTS) $$@ "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \ - -no-auto-link-packages `cat rts/libs.depend` $$(rts_ffi_objs) $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@ + -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@ else $$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend $$(rts_ffi_objs_stamp) "$$(RM)" $$(RM_OPTS) $$@ @@ -242,7 +242,7 @@ WARNING_OPTS += -Wredundant-decls # support for registerised builds on this arch. -- BL 2010/02/03 # WARNING_OPTS += -Wcast-align -STANDARD_OPTS += -Iincludes -Irts +STANDARD_OPTS += -Iincludes -Irts -Irts/dist/build # COMPILING_RTS is only used when building Win32 DLL support. STANDARD_OPTS += -DCOMPILING_RTS _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
