[gtk-osx] Use “gcc” for the compiler name w hen Xcode is 4 or later.

[John Ralls <jralls src gnome org>]

commit d2d6a25efe108ef985b7eabb1f5b1f2ba3519a11
Author: John Ralls <jralls ceridwen us>
Date:   Tue Dec 31 16:54:07 2013 -0800

    Use “gcc” for the compiler name when Xcode is 4 or later.
    
    This is a standard link to llvm-gcc-4.2 in Xcode 4 and to clang
    in Xcode 5.
    
    Also, raise an EnvironmentError if you try to build against the 10.4u
    SDK with Xcode 4 or later: SDK 10.4u doesn’t work with gcc-4.2, and
    only Xcode 3 and earlier support gcc-4.0.

 jhbuildrc-gtk-osx |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index b749f25..c0a8f47 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -302,18 +302,17 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
 
     #SDK 10.4 doesn't support gcc4.2.
     if  xcodeversion == 3.0 or sdk_version == "10.4u":
+        if xcodeversion > 4.0:
+            raise EnvironmentError("Can't build for 10.4 on Xcode 4 or later")
         os.environ["CC"] = os.path.join(_toolpath, "gcc-4.0")
         os.environ["OBJC"] = os.path.join(_toolpath, "gcc-4.0")
         os.environ["CXX"] = os.path.join(_toolpath, "g++-4.0")
-    elif xcodeversion >= 5.0:
-        os.environ["CC"] = "gcc"
-        os.environ["OBJC"] = "gcc"
-        os.environ["CXX"] = "g++"
-
-    elif _osx_version >= 7.0 and xcodeversion > 4.0:
-        os.environ["CC"] = os.path.join(_toolpath, "llvm-gcc-4.2")
-        os.environ["OBJC"] = os.path.join(_toolpath, "llvm-gcc-4.2")
-        os.environ["CXX"] = os.path.join(_toolpath, "llvm-g++-4.2")
+    #Note that the following will use Clang with Xcode 5.0 and
+    #llvm-gcc-4.2 on Xcode 4.x
+    elif _osx_version >= 7.0 or xcodeversion > 4.0:
+        os.environ["CC"] = os.path.join(_toolpath, "gcc")
+        os.environ["OBJC"] = os.path.join(_toolpath, "gcc")
+        os.environ["CXX"] = os.path.join(_toolpath, "g++")
     else:
         os.environ["CC"] = os.path.join(_toolpath, "gcc-4.2")
         os.environ["OBJC"] = os.path.join(_toolpath, "gcc-4.2")