X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=4e9b54874f93abec9abb83509d9b9b521d082a8c;hb=28c84fc1418d51e7788d2ff42460e4ee50b5e4d6;hp=9278126f3d76ea44be23d42a617d553e48f0d702;hpb=3e401d7b2fe29713c11824542422fdce93f4890c;p=ghc-hetmet.git diff --git a/configure.ac b/configure.ac index 9278126..4e9b548 100644 --- a/configure.ac +++ b/configure.ac @@ -134,6 +134,9 @@ if test "$WithGhc" != ""; then AC_SUBST(ghc_ge_613)dnl BOOTSTRAPPING_GHC_INFO_FIELD([CC_STAGE0],[C compiler command],['$(CC)']) + BOOTSTRAPPING_GHC_INFO_FIELD([AR_STAGE0],[ar command],['$(AR)']) + BOOTSTRAPPING_GHC_INFO_FIELD([AR_OPTS_STAGE0],[ar flags],['$(AR_OPTS)']) + BOOTSTRAPPING_GHC_INFO_FIELD([ArSupportsAtFile_STAGE0],[ar supports at file],['$(ArSupportsAtFile)']) fi dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on @@ -262,6 +265,7 @@ checkVendor() { esac } +# Sync this with cTargetOS in compiler/ghc.mk checkOS() { case $1 in linux|freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku) @@ -305,12 +309,15 @@ checkOS "$TargetOS" # Verify that the installed (bootstrap) GHC is capable of generating # code for the requested build platform. -if test "$BuildPlatform" != "$bootstrap_target" +if test "$BootingFromHc" = "NO" then - echo "This GHC (${WithGhc}) does not generate code for the build platform" - echo " GHC target platform : $bootstrap_target" - echo " Desired build platform : $BuildPlatform" - exit 1 + if test "$BuildPlatform" != "$bootstrap_target" + then + echo "This GHC (${WithGhc}) does not generate code for the build platform" + echo " GHC target platform : $bootstrap_target" + echo " Desired build platform : $BuildPlatform" + exit 1 + fi fi echo "GHC build : $BuildPlatform"