Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-7.2
http://hackage.haskell.org/trac/ghc/changeset/879c4fa166388adb6555078893b12dea1694d1d2 >--------------------------------------------------------------- commit 879c4fa166388adb6555078893b12dea1694d1d2 Author: Ian Lynagh <[email protected]> Date: Wed Aug 3 00:53:57 2011 +0100 Refactor configure.ac's: Define FIND_GCC() in aclocal.m4 >--------------------------------------------------------------- aclocal.m4 | 18 ++++++++++++++++++ configure.ac | 13 +------------ distrib/configure.ac.in | 13 +------------ 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index dc94791..d798eb5 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1607,4 +1607,22 @@ AC_DEFUN([XCODE_VERSION],[ fi ]) +# FIND_GCC() +# -------------------------------- +# Finds where gcc is +AC_DEFUN([FIND_GCC],[ + if test "$TargetOS_CPP" = "darwin" && + test "$XCodeVersion1" -ge 4 + then + # From Xcode 4, use 'gcc-4.2' to force the use of the gcc legacy + # backend (instead of the LLVM backend) + FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc-4.2]) + else + FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc]) + fi + export CC + WhatGccIsCalled="$CC" + AC_SUBST(WhatGccIsCalled) +]) + # LocalWords: fi diff --git a/configure.ac b/configure.ac index b8b8f3c..b72d30d 100644 --- a/configure.ac +++ b/configure.ac @@ -426,18 +426,7 @@ AC_SUBST([SplitObjsBroken]) dnl ** Which gcc to use? dnl -------------------------------------------------------------- -if test "$TargetOS_CPP" = "darwin" && - test "$XCodeVersion1" -ge 4 -then - # From Xcode 4, use 'gcc-4.2' to force the use of the gcc legacy - # backend (instead of the LLVM backend) - FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc-4.2]) -else - FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc]) -fi -export CC -WhatGccIsCalled="$CC" -AC_SUBST(WhatGccIsCalled) +FIND_GCC() dnl ** Which ld to use? dnl -------------------------------------------------------------- diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in index 72fb712..ce51c27 100644 --- a/distrib/configure.ac.in +++ b/distrib/configure.ac.in @@ -51,18 +51,7 @@ XCODE_VERSION() dnl ** Which gcc to use? dnl -------------------------------------------------------------- -if test "$TargetOS_CPP" = "darwin" && - test "$XCodeVersion1" -ge 4 -then - # From Xcode 4, use 'gcc-4.2' to force the use of the gcc legacy backend (instead of the LLVM - # backend) - FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc-4.2]) -else - FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc]) -fi -export CC -WhatGccIsCalled="$CC" -AC_SUBST(WhatGccIsCalled) +FIND_GCC() FP_GCC_VERSION AC_PROG_CPP _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
