[82294] branches/release_2_0/base

[afb at macports.org]

Revision: 82294
          http://trac.macports.org/changeset/82294
Author:   afb at macports.org
Date:     2011-08-12 03:24:06 -0700 (Fri, 12 Aug 2011)
Log Message:
-----------
merge r81005,r81556 from trunk:
  set default compiler to cc

Revision Links:
--------------
    http://trac.macports.org/changeset/81005
    http://trac.macports.org/changeset/81556

Modified Paths:
--------------
    branches/release_2_0/base/src/port1.0/portconfigure.tcl

Property Changed:
----------------
    branches/release_2_0/base/


Property changes on: branches/release_2_0/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81557-81558,81562,81565,81567,81577,82135
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81005,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81556-81558,81562,81565,81567,81577,82135
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_0/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portconfigure.tcl	2011-08-12 10:05:11 UTC (rev 82293)
+++ branches/release_2_0/base/src/port1.0/portconfigure.tcl	2011-08-12 10:24:06 UTC (rev 82294)
@@ -194,6 +194,7 @@
 
     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" }
         gcc-4.0 { set name "Mac OS X gcc 4.0" }
@@ -354,7 +355,7 @@
 proc portconfigure::configure_get_default_compiler {args} {
     global xcodeversion macosx_deployment_target
     if {$xcodeversion == "none" || $xcodeversion == ""} {
-        return gcc
+        return cc
     } elseif {[rpm-vercomp $xcodeversion 4.2] >= 0} {
         return clang
     } elseif {[rpm-vercomp $xcodeversion 4.0] >= 0} {
@@ -371,6 +372,14 @@
     global configure.compiler prefix developer_dir
     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} {
                 cc   { set ret /usr/bin/gcc }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110812/01764d56/attachment.html>