Changeset 82294

Timestamp:

08/12/11 03:24:06 (4 years ago)

Author:

afb@…

Message:

merge r81005,r81556 from trunk:

set default compiler to cc

Location:

branches/release_2_0/base

Files:

• . (modified) (1 prop)
• src/port1.0/portconfigure.tcl (modified) (3 diffs)

branches/release_2_0/base/src/port1.0/portconfigure.tcl

@@ -195 +195 @@
     set name ""
     switch -exact ${configure.compiler} {
+        cc { set name "System cc" }
         gcc { set name "System gcc" }
         gcc-3.3 { set name "Mac OS X gcc 3.3" }
@@ -355 +356 @@
     global xcodeversion macosx_deployment_target
     if {$xcodeversion == "none" || $xcodeversion == ""} {
-        return gcc
+        return cc
     } elseif {[rpm-vercomp $xcodeversion 4.2] >= 0} {
         return clang
@@ -372 +373 @@
     set ret ""
     switch -exact ${configure.compiler} {
+        cc {
+            switch -exact ${type} {
+                cc   { set ret /usr/bin/cc }
+                objc { set ret /usr/bin/cc }
+                cxx  { set ret /usr/bin/c++ }
+                cpp  { set ret /usr/bin/cpp }
+            }
+        }
         gcc {
             switch -exact ${type} {