Commit 8d76bcc2 authored by Gabor Greif's avatar Gabor Greif 💬 Committed by Marge Bot

while at it rename XCode to the official Xcode

parent 0c51aeeb
Pipeline #14026 failed with stages
in 395 minutes and 34 seconds
...@@ -2121,26 +2121,26 @@ AC_SUBST(LIBRARY_[]translit([$1], [-], [_])[]_VERSION) ...@@ -2121,26 +2121,26 @@ AC_SUBST(LIBRARY_[]translit([$1], [-], [_])[]_VERSION)
# XCODE_VERSION() # XCODE_VERSION()
# -------------------------------- # --------------------------------
# Gets the version number of XCode, if on a Mac # Gets the version number of Xcode, if on a Mac
AC_DEFUN([XCODE_VERSION],[ AC_DEFUN([XCODE_VERSION],[
if test "$TargetVendor_CPP" = "apple" if test "$TargetVendor_CPP" = "apple"
then then
AC_MSG_CHECKING(XCode version) AC_MSG_CHECKING(Xcode version)
XCodeVersion=`(xcode-select -p >& /dev/null && xcodebuild -version) | grep Xcode | sed "s/Xcode //"` XcodeVersion=`(xcode-select -p >& /dev/null && xcodebuild -version) | grep Xcode | sed "s/Xcode //"`
# Old XCode versions don't actually give the XCode version # Old Xcode versions don't actually give the Xcode version
if test "$XCodeVersion" = "" if test "$XcodeVersion" = ""
then then
AC_MSG_RESULT(not found (too old?)) AC_MSG_RESULT(not found (too old?))
XCodeVersion1=0 XcodeVersion1=0
XCodeVersion2=0 XcodeVersion2=0
else else
AC_MSG_RESULT($XCodeVersion) AC_MSG_RESULT($XcodeVersion)
XCodeVersion1=`echo "$XCodeVersion" | sed 's/\..*//'` XcodeVersion1=`echo "$XcodeVersion" | sed 's/\..*//'`
changequote(, )dnl changequote(, )dnl
XCodeVersion2=`echo "$XCodeVersion" | sed 's/[^.]*\.\([^.]*\).*/\1/'` XcodeVersion2=`echo "$XcodeVersion" | sed 's/[^.]*\.\([^.]*\).*/\1/'`
changequote([, ])dnl changequote([, ])dnl
AC_MSG_NOTICE(XCode version component 1: $XCodeVersion1) AC_MSG_NOTICE(Xcode version component 1: $XcodeVersion1)
AC_MSG_NOTICE(XCode version component 2: $XCodeVersion2) AC_MSG_NOTICE(Xcode version component 2: $XcodeVersion2)
fi fi
fi fi
]) ])
......
...@@ -231,13 +231,13 @@ getCompilerInfo' dflags = do ...@@ -231,13 +231,13 @@ getCompilerInfo' dflags = do
-- FreeBSD clang -- FreeBSD clang
| any ("FreeBSD clang version" `isInfixOf`) stde = | any ("FreeBSD clang version" `isInfixOf`) stde =
return Clang return Clang
-- XCode 5.1 clang -- Xcode 5.1 clang
| any ("Apple LLVM version 5.1" `isPrefixOf`) stde = | any ("Apple LLVM version 5.1" `isPrefixOf`) stde =
return AppleClang51 return AppleClang51
-- XCode 5 clang -- Xcode 5 clang
| any ("Apple LLVM version" `isPrefixOf`) stde = | any ("Apple LLVM version" `isPrefixOf`) stde =
return AppleClang return AppleClang
-- XCode 4.1 clang -- Xcode 4.1 clang
| any ("Apple clang version" `isPrefixOf`) stde = | any ("Apple clang version" `isPrefixOf`) stde =
return AppleClang return AppleClang
-- Unknown linker. -- Unknown linker.
......
...@@ -586,7 +586,7 @@ AC_SUBST([NmCmd]) ...@@ -586,7 +586,7 @@ AC_SUBST([NmCmd])
if test "$TargetOS_CPP" = "darwin" if test "$TargetOS_CPP" = "darwin"
then then
AC_MSG_CHECKING(whether nm program is broken) AC_MSG_CHECKING(whether nm program is broken)
# Some versions of XCode ship a broken version of `nm`. Detect and work # Some versions of Xcode ship a broken version of `nm`. Detect and work
# around this issue. See : https://gitlab.haskell.org/ghc/ghc/issues/11744 # around this issue. See : https://gitlab.haskell.org/ghc/ghc/issues/11744
nmver=$(${NM} --version | grep version | sed 's/ //g') nmver=$(${NM} --version | grep version | sed 's/ //g')
case "$nmver" in case "$nmver" in
......
...@@ -58,7 +58,7 @@ To install LLVM and Clang: ...@@ -58,7 +58,7 @@ To install LLVM and Clang:
- *Linux*: Use your package management tool. - *Linux*: Use your package management tool.
- *Mac OS X*: Clang is included by default on recent OS X machines when - *Mac OS X*: Clang is included by default on recent OS X machines when
XCode is installed (from 10.6 and later). LLVM is not included. Xcode is installed (from 10.6 and later). LLVM is not included.
In order to use the LLVM based code generator, you should install the In order to use the LLVM based code generator, you should install the
`Homebrew <http://mxcl.github.com/homebrew/>`__ package manager for `Homebrew <http://mxcl.github.com/homebrew/>`__ package manager for
OS X. Alternatively you can download binaries for LLVM and Clang from OS X. Alternatively you can download binaries for LLVM and Clang from
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment