diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-04-23 17:21:59 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-04-23 17:21:59 +0100 |
| commit | 02c76a04093613960f8016fba07a8a6e59e7cd3b (patch) | |
| tree | 80d69a4576a1da01d22422f3c81a27327c3e574d | |
| parent | ca07d92837fc1e3ae9be67bb7d9e7f1b8035b00f (diff) | |
| download | haskell-02c76a04093613960f8016fba07a8a6e59e7cd3b.tar.gz | |
Make and use AR_STAGE[0123] makefile vars
| -rw-r--r-- | libffi/ghc.mk | 2 | ||||
| -rw-r--r-- | mk/config.mk.in | 6 | ||||
| -rw-r--r-- | rts/ghc.mk | 4 | ||||
| -rw-r--r-- | rules/build-package-way.mk | 4 | ||||
| -rw-r--r-- | rules/package-config.mk | 1 |
5 files changed, 12 insertions, 5 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk index 46400ab43e..f7caeda782 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -116,7 +116,7 @@ $(libffi_STAMP_CONFIGURE): cd build && \ CC=$(CC_STAGE1) \ LD=$(LD) \ - AR=$(AR) \ + AR=$(AR_STAGE1) \ NM=$(NM) \ CFLAGS="$(SRC_CC_OPTS) $(CONF_CC_OPTS_STAGE1) -w" \ LDFLAGS="$(SRC_LD_OPTS) $(CONF_GCC_LINKER_OPTS_STAGE1) -w" \ diff --git a/mk/config.mk.in b/mk/config.mk.in index 4d61a35350..0a803f06db 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -599,6 +599,12 @@ AR = @ArCmd@ AR_OPTS = @ArArgs@ ArSupportsInput = @ArSupportsInput@ ArSupportsAtFile = @ArSupportsAtFile@ + +AR_STAGE0 = $(AR) +AR_STAGE1 = $(AR) +AR_STAGE2 = $(AR) +AR_STAGE3 = $(AR) + # Yuckage: for ghc/utils/parallel -- todo: nuke this dependency!! BASH = /usr/local/bin/bash diff --git a/rts/ghc.mk b/rts/ghc.mk index 53bb72c0af..8925ff9179 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -194,7 +194,7 @@ endif else $$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) "$$(RM)" $$(RM_OPTS) $$@ - echo $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR)" \ + echo $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR_STAGE1)" \ $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@ endif @@ -499,7 +499,7 @@ endif ifneq "$(BINDIST)" "YES" rts/dist/build/libHSrtsmain.a : rts/dist/build/Main.o "$(RM)" $(RM_OPTS) $@ - "$(AR)" $(AR_OPTS) $(EXTRA_AR_ARGS) $@ $< + "$(AR_STAGE1)" $(AR_OPTS) $(EXTRA_AR_ARGS) $@ $< endif # ----------------------------------------------------------------------------- diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index d6c1560e10..9f69536b5e 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -88,9 +88,9 @@ else echo $$($1_$2_$3_ALL_OBJS) >> $$@.contents endif ifeq "$$(ArSupportsAtFile)" "YES" - "$$(AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@ @$$@.contents + "$$($1_$2_AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@ @$$@.contents else - "$$(XARGS)" $$(XARGS_OPTS) "$$(AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@ < $$@.contents + "$$(XARGS)" $$(XARGS_OPTS) "$$($1_$2_AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@ < $$@.contents endif "$$(RM)" $$(RM_OPTS) $$@.contents endif diff --git a/rules/package-config.mk b/rules/package-config.mk index 65df6bf235..dcfc26e47a 100644 --- a/rules/package-config.mk +++ b/rules/package-config.mk @@ -17,6 +17,7 @@ $(call profStart, package-config($1,$2,$3)) $1_$2_HC = $$(GHC_STAGE$3) $1_$2_CC = $$(CC_STAGE$3) +$1_$2_AR = $$(AR_STAGE$3) # configuration stuff that depends on which GHC we're building with ifeq "$3" "0" |