diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-04-29 14:37:44 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-04-29 14:37:44 +0100 |
| commit | 3d8e6f6b1910080defad4ab2687255eb6e6df34b (patch) | |
| tree | 3dc8a9a549ea471989f408d91d8b149cf8a98184 /rules | |
| parent | feabe9933969905173d0abe94343d9355e3d8df6 (diff) | |
| download | haskell-3d8e6f6b1910080defad4ab2687255eb6e6df34b.tar.gz | |
Add stage-specific AS variables to the build system
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/c-suffix-rules.mk | 2 | ||||
| -rw-r--r-- | rules/package-config.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/rules/c-suffix-rules.mk b/rules/c-suffix-rules.mk index bba73a82c6..a4a0b579db 100644 --- a/rules/c-suffix-rules.mk +++ b/rules/c-suffix-rules.mk @@ -49,7 +49,7 @@ $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.c "$$($1_$2_CC)" $$($1_$2_$3_ALL_CC_OPTS) -c $$< -o $$@ $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.$$($3_way_)s - "$$(AS)" $$($1_$2_$3_ALL_AS_OPTS) -o $$@ $$< + "$$($1_$2_AS)" $$($1_$2_$3_ALL_AS_OPTS) -o $$@ $$< $1/$2/build/%.$$($3_osuf) : $1/%.S | $$$$(dir $$$$@)/. "$$($1_$2_CC)" $$($1_$2_$3_ALL_CC_OPTS) -c $$< -o $$@ diff --git a/rules/package-config.mk b/rules/package-config.mk index 7873157363..177ca2517d 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_AS = $$(AS_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) |