1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always use the macx-clang mkspec when compiling Qt on OS X

Browse Source 
macx-g++ is not supported anymore.

Change-Id: Ibae25768e240d6e8e27c09a345ea02a9b0477fc3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
This commit is contained in:
Lars Knoll 2016-04-19 17:01:51 +02:00
parent 2a995c77d4
commit b85bc84dcc
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure vendored
View File

@ -2676,27 +2676,7 @@ if [ -z "$PLATFORM" ]; then
PLATFORM_NOTES= PLATFORM_NOTES=
case "$UNAME_SYSTEM:$UNAME_RELEASE" in case "$UNAME_SYSTEM:$UNAME_RELEASE" in
Darwin:*) Darwin:*)
# Select compiler. Use g++ unless we find a usable Clang version. Note that PLATFORM=macx-clang
# we are checking the "Apple" clang/LLVM version number, not the actual
# clang/LLVM version number that the Apple version was based on. We look
# for Apple clang version 3.0 or higher, which was branched off LLVM 3.0
# from SVN, and first included in Xcode 4.2. Also note that we do not care
# about the OS version, since we're not using the clang version that comes
# with the system. We use 'xcrun' to check the clang version that's part of
# the Xcode installation.
XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`
CLANGVERSION=`echo "$XCRUN" | sed -n 's/.*version \([0-9]\).*/\1/p'`
expr "$CLANGVERSION" : '[0-9]' > /dev/null || { echo "Unable to determine CLANG version from output of xcrun: $XCRUN" ; exit 2 ; }
if [ "$CLANGVERSION" -ge 3 ]; then
PLATFORM=macx-clang
# Advertise g++ as an alternative on Lion and below
if [ "$(uname -r | cut -d. -f1)" -le 11 ]; then
PLATFORM_NOTES="\n - Also available for Mac OS X: macx-g++\n"
fi
else
PLATFORM=macx-g++
fi
;; ;;
AIX:*) AIX:*)
#PLATFORM=aix-g++ #PLATFORM=aix-g++