diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-01-11 19:01:55 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-01-11 19:02:55 +0000 |
| commit | ce706636d5ec8337e1bf5714e1be94e6b556d809 (patch) | |
| tree | 9acd6d94f6f3dff855f1cbf57d825ddd503f0976 | |
| parent | b56e7b20605d742536441ed721a4fa21598782d5 (diff) | |
| download | haskell-ce706636d5ec8337e1bf5714e1be94e6b556d809.tar.gz | |
Don't try to use gcc-4.2 on XCode >= 4.2
It was removed in 4.2.
| -rw-r--r-- | aclocal.m4 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index c54918e4ae..1c89e0d02a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1989,10 +1989,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]) |