Skip to content
Snippets Groups Projects
Commit 0f75ae43 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Small configure.ac refactoring

parent 981312d7
No related branches found
No related tags found
No related merge requests found
...@@ -403,7 +403,6 @@ then ...@@ -403,7 +403,6 @@ then
fi fi
fi fi
SplitObjsBroken=NO
if test "$TargetOS_CPP" = "darwin" if test "$TargetOS_CPP" = "darwin"
then then
AC_MSG_CHECKING(XCode version) AC_MSG_CHECKING(XCode version)
...@@ -412,7 +411,8 @@ then ...@@ -412,7 +411,8 @@ then
if test "$XCodeVersion" = "" if test "$XCodeVersion" = ""
then then
AC_MSG_RESULT(not found (too old?)) AC_MSG_RESULT(not found (too old?))
SplitObjsBroken=YES XCodeVersion1=0
XCodeVersion2=0
else else
AC_MSG_RESULT($XCodeVersion) AC_MSG_RESULT($XCodeVersion)
XCodeVersion1=`echo "$XCodeVersion" | sed 's/\..*//'` XCodeVersion1=`echo "$XCodeVersion" | sed 's/\..*//'`
...@@ -421,17 +421,22 @@ changequote(, )dnl ...@@ -421,17 +421,22 @@ changequote(, )dnl
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)
# Split objects is broken (#4013) with XCode < 3.2 fi
if test "$XCodeVersion1" -lt 3 fi
SplitObjsBroken=NO
if test "$TargetOS_CPP" = "darwin"
then
# Split objects is broken (#4013) with XCode < 3.2
if test "$XCodeVersion1" -lt 3
then
SplitObjsBroken=YES
else
if test "$XCodeVersion1" -eq 3
then then
SplitObjsBroken=YES if test "$XCodeVersion2" -lt 2
else
if test "$XCodeVersion1" -eq 3
then then
if test "$XCodeVersion2" -lt 2 SplitObjsBroken=YES
then
SplitObjsBroken=YES
fi
fi fi
fi fi
fi fi
...@@ -443,8 +448,8 @@ dnl -------------------------------------------------------------- ...@@ -443,8 +448,8 @@ dnl --------------------------------------------------------------
if test "$TargetOS_CPP" = "darwin" && if test "$TargetOS_CPP" = "darwin" &&
test "$XCodeVersion1" -ge 4 test "$XCodeVersion1" -ge 4
then then
# From Xcode 4, use 'gcc-4.2' to force the use of the gcc legacy backend (instead of the LLVM # From Xcode 4, use 'gcc-4.2' to force the use of the gcc legacy
# backend) # backend (instead of the LLVM backend)
FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc-4.2]) FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc-4.2])
else else
FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc]) FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment