diff options
| -rw-r--r-- | mk/config.mk.in | 5 | ||||
| -rw-r--r-- | rules/c-suffix-rules.mk | 2 | ||||
| -rw-r--r-- | rules/package-config.mk | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index f96302b4fe..3d2d6c0798 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -548,6 +548,11 @@ CC_STAGE0 = @CC_STAGE0@ CC_STAGE1 = $(CC) CC_STAGE2 = $(CC) CC_STAGE3 = $(CC) +AS = $(WhatGccIsCalled) +AS_STAGE0 = @CC_STAGE0@ +AS_STAGE1 = $(AS) +AS_STAGE2 = $(AS) +AS_STAGE3 = $(AS) # C compiler and linker flags from configure (e.g. -m<blah> to select # correct C compiler backend). The stage number is the stage of GHC 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) |