diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-10-14 16:25:31 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-10-14 16:25:31 +0100 |
| commit | cdbd8ff54e9abd478844f78ef2953ce90abaa25d (patch) | |
| tree | 8aa5e5ddf7e4cb092e01808f177d9beb709b968e | |
| parent | 85b0d3edc267790934bba312239e48c9f01e3c2e (diff) | |
| parent | 0ffc2b29dceab32c808b6e5a7232859711385a18 (diff) | |
| download | haskell-cdbd8ff54e9abd478844f78ef2953ce90abaa25d.tar.gz | |
Merge branch 'master' of dippy:c:/msys/1.0/home/ian/ghc/.
| -rw-r--r-- | rts/ghc.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rts/ghc.mk b/rts/ghc.mk index 767194e23f..a007f1aeb7 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 |