X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=3749bce6b6937c3c81f7901d27dffe952a0cf395;hb=51fd4a1db15971e8eb46a2d665dc3f1572b95653;hp=f96302b4febb4f4d7468b0ee555f17656fd586ae;hpb=b8c25820084a46b1239ad7d87bee6391dd5c1017;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index f96302b..3749bce 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
@@ -599,11 +604,11 @@ AR			= @ArCmd@
 AR_OPTS			= @ArArgs@
 ArSupportsAtFile = @ArSupportsAtFile@
 
-AR_STAGE0 = $(AR)
+AR_STAGE0 = @AR_STAGE0@
 AR_STAGE1 = $(AR)
 AR_STAGE2 = $(AR)
 AR_STAGE3 = $(AR)
-AR_OPTS_STAGE0 = $(AR_OPTS)
+AR_OPTS_STAGE0 = @AR_OPTS_STAGE0@
 AR_OPTS_STAGE1 = $(AR_OPTS)
 AR_OPTS_STAGE2 = $(AR_OPTS)
 AR_OPTS_STAGE3 = $(AR_OPTS)
@@ -611,7 +616,7 @@ EXTRA_AR_ARGS_STAGE0 = $(EXTRA_AR_ARGS)
 EXTRA_AR_ARGS_STAGE1 = $(EXTRA_AR_ARGS)
 EXTRA_AR_ARGS_STAGE2 = $(EXTRA_AR_ARGS)
 EXTRA_AR_ARGS_STAGE3 = $(EXTRA_AR_ARGS)
-ArSupportsAtFile_STAGE0 = $(ArSupportsAtFile)
+ArSupportsAtFile_STAGE0 = @ArSupportsAtFile_STAGE0@
 ArSupportsAtFile_STAGE1 = $(ArSupportsAtFile)
 ArSupportsAtFile_STAGE2 = $(ArSupportsAtFile)
 ArSupportsAtFile_STAGE3 = $(ArSupportsAtFile)
@@ -769,8 +774,6 @@ ALEX_VERSION		= @AlexVersion@
 #
 SRC_ALEX_OPTS		= -g
 
-HSTAGS = @HstagsCmd@
-
 # Should we build haddock docs?
 HADDOCK_DOCS = YES
 # And HsColour the sources?