X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=43f8e26860a0e5f5169f9458963f033adb98d869;hb=19e6c56f76a4069f8b4fe86d2b631dceb7b5e6c5;hp=e6126f666710b93a7318bebbae2d2dfd6597ee4e;hpb=e75227feacf1434a342c8a7e6ec3619dc6771c39;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index e6126f6..43f8e26 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -540,15 +540,14 @@ endif # the flag --with-gcc= instead. The reason is that the configure script # needs to know which gcc you're using in order to perform its tests. -UseGcc = YES WhatGccIsCalled = @WhatGccIsCalled@ GccVersion = @GccVersion@ -GccLT34 = @GccLT34@ -ifneq "$(strip $(UseGcc))" "YES" - CC = cc -else - CC = $(WhatGccIsCalled) -endif +GccLT34 = @GccLT34@ +CC = $(WhatGccIsCalled) +CC_STAGE0 = $(CC) +CC_STAGE1 = $(CC) +CC_STAGE2 = $(CC) +CC_STAGE3 = $(CC) # C compiler and linker flags from configure (e.g. -m to select # correct C compiler backend). The stage number is the stage of GHC @@ -600,8 +599,11 @@ AR = @ArCmd@ AR_OPTS = @ArArgs@ ArSupportsInput = @ArSupportsInput@ ArSupportsAtFile = @ArSupportsAtFile@ -# Yuckage: for ghc/utils/parallel -- todo: nuke this dependency!! -BASH = /usr/local/bin/bash + +AR_STAGE0 = $(AR) +AR_STAGE1 = $(AR) +AR_STAGE2 = $(AR) +AR_STAGE3 = $(AR) CONTEXT_DIFF = @ContextDiffCmd@ CP = cp @@ -634,7 +636,6 @@ NROFF = nroff PERL = @PerlCmd@ PYTHON = @PythonCmd@ PIC = pic -PREPROCESSCMD = $(CC) -E RANLIB = @RANLIB@ SED = @SedCmd@ TR = tr