diff options
| author | Duncan Coutts <duncan@well-typed.com> | 2009-04-29 14:31:31 +0000 |
|---|---|---|
| committer | Duncan Coutts <duncan@well-typed.com> | 2009-04-29 14:31:31 +0000 |
| commit | 7f995ef4d41815cd2d9fab774a638b5493d33910 (patch) | |
| tree | 5355d6fe2fbd60c5cdbe782763f2fd6b15f8fc5b /rts | |
| parent | 118b39e4db1a8187af52c1ddb1b299021834a5a2 (diff) | |
| download | haskell-7f995ef4d41815cd2d9fab774a638b5493d33910.tar.gz | |
Build the rts as a shared lib correctly
That is, build it as a .so/.dll rather than as libHSrts_dyn.a
Diffstat (limited to 'rts')
| -rw-r--r-- | rts/ghc.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/rts/ghc.mk b/rts/ghc.mk index 0bd6d7191d..54b9c657d4 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -16,9 +16,10 @@ # We build the RTS with stage 1 rts_dist_HC = $(GHC_STAGE1) -rts_WAYS = $(strip $(GhcLibWays) $(GhcRTSWays)) +# merge GhcLibWays and GhcRTSWays but strip out duplicates +rts_WAYS = $(GhcLibWays) $(filter-out $(GhcLibWays),$(GhcRTSWays)) -ALL_RTS_LIBS = $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)__way).a) +ALL_RTS_LIBS = $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)_libsuf)) all_rts : $(ALL_RTS_LIBS) # The per-dir options @@ -119,7 +120,7 @@ $(call distdir-way-opts,rts,dist,$1) $(call c-suffix-rules,rts,dist,$1,YES) $(call cmm-suffix-rules,rts,dist,$1) -rts_$1_LIB = rts/dist/build/libHSrts$$($1__way).a +rts_$1_LIB = rts/dist/build/libHSrts$$($1_libsuf) rts_$1_C_OBJS = $$(patsubst rts/%.c,rts/dist/build/%.$$($1_osuf),$$(rts_C_SRCS)) $$(patsubst %.c,%.$$($1_osuf),$$(rts_$1_EXTRA_C_SRCS)) rts_$1_S_OBJS = $$(patsubst rts/%.S,rts/dist/build/%.$$($1_osuf),$$(rts_S_SRCS)) @@ -127,9 +128,15 @@ rts_$1_CMM_OBJS = $$(patsubst rts/%.cmm,rts/dist/build/%.$$($1_osuf),$$(rts_CMM_ rts_$1_OBJS = $$(rts_$1_C_OBJS) $$(rts_$1_S_OBJS) $$(rts_$1_CMM_OBJS) +ifneq "$$(findstring dyn, $1)" "" +$$(rts_$1_LIB) : $$(rts_$1_OBJS) + $$(RM) $$@ + $$(rts_dist_HC) -shared -dynamic -no-auto-link-packages $$(rts_$1_OBJS) -o $$@ +else $$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(RM) $$@ echo $$(rts_$1_OBJS) | xargs $$(AR) $$(EXTRA_AR_ARGS) $$@ +endif endef |