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 /rules | |
| parent | ca07d92837fc1e3ae9be67bb7d9e7f1b8035b00f (diff) | |
| download | haskell-02c76a04093613960f8016fba07a8a6e59e7cd3b.tar.gz | |
Make and use AR_STAGE[0123] makefile vars
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-package-way.mk | 4 | ||||
| -rw-r--r-- | rules/package-config.mk | 1 |
2 files changed, 3 insertions, 2 deletions
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" |