diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-04-23 17:49:50 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-04-23 18:49:09 +0100 |
| commit | 70b4e94b9423904e817c88e5b55732f7f3df9fbc (patch) | |
| tree | aed4484a5d0ab1e8ff3ea23d2ae3db380d36dfec /rules | |
| parent | 4c452d125983172e55075c457b745289afd72d0e (diff) | |
| download | haskell-70b4e94b9423904e817c88e5b55732f7f3df9fbc.tar.gz | |
Add stage-specific versions of more ar-related makefile vars
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-package-way.mk | 6 | ||||
| -rw-r--r-- | rules/package-config.mk | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index 9f69536b5e..a7dc9182a0 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -87,10 +87,10 @@ ifeq "$$($1_$2_SplitObjs)" "YES" else echo $$($1_$2_$3_ALL_OBJS) >> $$@.contents endif -ifeq "$$(ArSupportsAtFile)" "YES" - "$$($1_$2_AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@ @$$@.contents +ifeq "$$($1_$2_ArSupportsAtFile)" "YES" + "$$($1_$2_AR)" $$($1_$2_AR_OPTS) $$($1_$2_EXTRA_AR_ARGS) $$@ @$$@.contents else - "$$(XARGS)" $$(XARGS_OPTS) "$$($1_$2_AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@ < $$@.contents + "$$(XARGS)" $$(XARGS_OPTS) "$$($1_$2_AR)" $$($1_$2_AR_OPTS) $$($1_$2_EXTRA_AR_ARGS) $$@ < $$@.contents endif "$$(RM)" $$(RM_OPTS) $$@.contents endif diff --git a/rules/package-config.mk b/rules/package-config.mk index dcfc26e47a..7873157363 100644 --- a/rules/package-config.mk +++ b/rules/package-config.mk @@ -18,6 +18,9 @@ $(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) +$1_$2_AR_OPTS = $$(AR_OPTS_STAGE$3) +$1_$2_EXTRA_AR_ARGS = $$(EXTRA_AR_ARGS_STAGE$3) +$1_$2_ArSupportsAtFile = $$(ArSupportsAtFile_STAGE$3) # configuration stuff that depends on which GHC we're building with ifeq "$3" "0" |