X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=a8d535fc3b141154620b0e22c7edd8973a963e83;hb=b5a358ee5582b139e2499d873c696eb27742f028;hp=967fd6f730ab5a9b7c3b8bb1aab96dc8a5eaf098;hpb=74430537272aecdc8fd85b4877cec76cc042c8ad;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 967fd6f..a8d535f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -288,7 +288,7 @@ checkOS "$TargetOS"
 
 # Verify that the installed (bootstrap) GHC is capable of generating
 # code for the requested build platform.
-if test "$build" != "$bootstrap_target"
+if test "$BuildPlatform" != "$bootstrap_target"
 then
     echo "This GHC (${WithGhc}) does not generate code for the build platform"
     echo "   GHC target platform    : $bootstrap_target"
@@ -296,6 +296,10 @@ then
     exit 1
 fi
 
+echo "GHC build  : $BuildPlatform"
+echo "GHC host   : $HostPlatform"
+echo "GHC target : $TargetPlatform"
+
 AC_SUBST(BuildPlatform)
 AC_SUBST(HostPlatform)
 AC_SUBST(TargetPlatform)
@@ -417,22 +421,34 @@ AC_SUBST([NmCmd])
 SplitObjsBroken=NO
 if test "$TargetOS_CPP" = "darwin"
 then
+    AC_MSG_CHECKING(XCode version)
     XCodeVersion=`xcodebuild -version | grep Xcode | sed "s/Xcode //"`
-    XCodeVersion1=`echo "$XCodeVersion" | sed 's/\..*//'`
-    XCodeVersion2=`echo "$XCodeVersion" | sed 's/.*\.//'`
     # Old XCode versions don't actually give the XCode version
     if test "$XCodeVersion" = ""
     then
+        AC_MSG_RESULT(not found (too old?))
         SplitObjsBroken=YES
-    fi
-    # Split objects is broken (#4013) with XCode < 3.2
-    if test "$XCodeVersion1" -lt 3
-    then
-        SplitObjsBroken=YES
-    fi
-    if test "$XCodeVersion1" -eq 3 && test "$XCodeVersion2" -lt 2
-    then
-        SplitObjsBroken=YES
+    else
+        AC_MSG_RESULT($XCodeVersion)
+        XCodeVersion1=`echo "$XCodeVersion" | sed 's/\..*//'`
+changequote(, )dnl
+        XCodeVersion2=`echo "$XCodeVersion" | sed 's/[^.]*\.\([^.]*\).*/\1/'`
+changequote([, ])dnl
+        AC_MSG_NOTICE(XCode version component 1: $XCodeVersion1)
+        AC_MSG_NOTICE(XCode version component 2: $XCodeVersion2)
+        # Split objects is broken (#4013) with XCode < 3.2
+        if test "$XCodeVersion1" -lt 3
+        then
+            SplitObjsBroken=YES
+        else
+            if test "$XCodeVersion1" -eq 3
+            then
+                if test "$XCodeVersion2" -lt 2
+                then
+                    SplitObjsBroken=YES
+                fi
+            fi
+        fi
     fi
 fi
 AC_SUBST([SplitObjsBroken])