From babf070d4c20a1a3438918fcd6b1cc5d20f0dbe1 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Wed, 24 Jun 2009 13:45:31 +0000 Subject: [PATCH] Make C and CMM objects way-dependent In particular, in the integer-gmp package the C and CMM code depends on the size of STG structures, which vary between ways. --- rules/build-package-way.mk | 14 +++++++------- rules/build-package.mk | 16 +++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index 421cd6f..8994b2c 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -35,7 +35,7 @@ $1_$2_$3_MKSTUBOBJS = find $1/$2/build -name "*_stub.$$($3_osuf)" -print # make using cached directory contents, or something. else $1_$2_$3_MKSTUBOBJS = true -$1_$2_v_C_OBJS += $$(shell find $1/$2/build -name "*_stub.c" -print | sed 's/c$$$$/o/') +$1_$2_$3_C_OBJS += $$(shell find $1/$2/build -name "*_stub.c" -print | sed 's/c$$$$/o/') endif ifeq "$3" "dyn" @@ -50,13 +50,13 @@ $$($1_$2_$3_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_dyn_C_OBJS) $$($1_$2_dyn_S_OBJS else # Build the ordinary .a library ifeq "$$($1_$2_SplitObjs)" "YES" -$$($1_$2_$3_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_v_CMM_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) $$($1_$2_EXTRA_OBJS) +$$($1_$2_$3_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS) "$$(RM)" $$(RM_OPTS) $$@ - (echo $$($1_$2_v_CMM_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) `$$($1_$2_$3_MKSTUBOBJS)` $$($1_$2_EXTRA_OBJS); find $$(patsubst %.$$($3_osuf),%_split,$$($1_$2_$3_HS_OBJS)) -name '*.$$($3_osuf)' -print) | $$(XARGS) $$(AR) $$(EXTRA_AR_ARGS) $$@ || "$$(RM)" $$(RM_OPTS) $$@ + (echo $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) `$$($1_$2_$3_MKSTUBOBJS)` $$($1_$2_EXTRA_OBJS); find $$(patsubst %.$$($3_osuf),%_split,$$($1_$2_$3_HS_OBJS)) -name '*.$$($3_osuf)' -print) | $$(XARGS) $$(AR) $$(EXTRA_AR_ARGS) $$@ || "$$(RM)" $$(RM_OPTS) $$@ else -$$($1_$2_$3_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_v_CMM_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) $$($1_$2_EXTRA_OBJS) +$$($1_$2_$3_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS) "$$(RM)" $$(RM_OPTS) $$@ - echo $$($1_$2_v_CMM_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) $$($1_$2_$3_HS_OBJS) `$$($1_$2_$3_MKSTUBOBJS)` $$($1_$2_EXTRA_OBJS) | $$(XARGS) $$(AR) $$(EXTRA_AR_ARGS) $$@ || "$$(RM)" $$(RM_OPTS) $$@ + echo $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_$3_HS_OBJS) `$$($1_$2_$3_MKSTUBOBJS)` $$($1_$2_EXTRA_OBJS) | $$(XARGS) $$(AR) $$(EXTRA_AR_ARGS) $$@ || "$$(RM)" $$(RM_OPTS) $$@ endif endif @@ -76,9 +76,9 @@ $1_$2_GHCI_LIB = $1/$2/build/HS$$($1_PACKAGE)-$$($1_$2_VERSION).$$($3_osuf) ifneq "$4" "0" BINDIST_LIBS += $$($1_$2_GHCI_LIB) endif -$$($1_$2_GHCI_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_v_CMM_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) $$($1_$2_EXTRA_OBJS) +$$($1_$2_GHCI_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS) "$$(RM)" $$(RM_OPTS) $$@ - "$$(LD)" -r -o $$@ $$(EXTRA_LD_OPTS) $$($1_$2_$3_HS_OBJS) $$($1_$2_v_CMM_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) `$$($1_$2_$3_MKSTUBOBJS)` $$($1_$2_EXTRA_OBJS) + "$$(LD)" -r -o $$@ $$(EXTRA_LD_OPTS) $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) `$$($1_$2_$3_MKSTUBOBJS)` $$($1_$2_EXTRA_OBJS) $(call all-target,$1_$2,$$($1_$2_GHCI_LIB)) endif diff --git a/rules/build-package.mk b/rules/build-package.mk index a25a3d2..c598ef8 100644 --- a/rules/build-package.mk +++ b/rules/build-package.mk @@ -127,20 +127,22 @@ $1_$2_SplitObjs = NO endif endif -# C and S files are built the "v" vanlilla way and possibly also the "dyn" way. -$(call c-objs,$1,$2,v) $(call distdir-opts,$1,$2,$3) -$(call c-suffix-rules,$1,$2,v,YES) + +# C and S files are possibly built the "dyn" way. ifeq "$(BuildSharedLibs)" "YES" $(call c-objs,$1,$2,dyn) $(call c-suffix-rules,$1,$2,dyn,YES) endif -$(call cmm-objs,$1,$2,v) -$(call cmm-suffix-rules,$1,$2,v) - # Now generate all the build rules for each way in this directory: -$$(foreach way,$$($1_$2_WAYS),$$(eval $$(call build-package-way,$1,$2,$$(way),$3))) +$$(foreach way,$$($1_$2_WAYS),$$(eval \ + $$(call c-objs,$1,$2,$$(way)) \ + $$(call c-suffix-rules,$1,$2,$$(way),YES) \ + $$(call cmm-objs,$1,$2,$$(way)) \ + $$(call cmm-suffix-rules,$1,$2,$$(way)) \ + $$(call build-package-way,$1,$2,$$(way),$3) \ + )) $(call haddock,$1,$2) -- 1.7.10.4