Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-7.4
http://hackage.haskell.org/trac/ghc/changeset/6ce7d8008c59fd6cf0be975a503d202866d45744 >--------------------------------------------------------------- commit 6ce7d8008c59fd6cf0be975a503d202866d45744 Author: Ian Lynagh <[email protected]> Date: Wed Jan 11 19:01:55 2012 +0000 Don't try to use gcc-4.2 on XCode >= 4.2 It was removed in 4.2. >--------------------------------------------------------------- aclocal.m4 | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 5400664..7d33fcd 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1936,10 +1936,12 @@ AC_DEFUN([XCODE_VERSION],[ # Finds where gcc is AC_DEFUN([FIND_GCC],[ if test "$TargetOS_CPP" = "darwin" && - test "$XCodeVersion1" -ge 4 + test "$XCodeVersion1" -eq 4 && + test "$XCodeVersion2" -lt 2 then - # From Xcode 4, use 'gcc-4.2' to force the use of the gcc legacy - # backend (instead of the LLVM backend) + # In Xcode 4.1, 'gcc-4.2' is the gcc legacy backend (rather + # than the LLVM backend). We prefer the legacy gcc, but in + # Xcode 4.2 'gcc-4.2' was removed. FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc-4.2]) else FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc]) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
