[107774] branches/release_2_2

[jmr at macports.org]

Revision: 107774
          https://trac.macports.org/changeset/107774
Author:   jmr at macports.org
Date:     2013-07-05 09:39:03 -0700 (Fri, 05 Jul 2013)
Log Message:
-----------
merge r107753 from trunk:
 Fallback on macports-clang-3.3 rather than macports-clang-3.2

Revision Links:
--------------
    https://trac.macports.org/changeset/107753

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

Property Changed:
----------------
    branches/release_2_2/
    branches/release_2_2/base/


Property changes on: branches/release_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:107106,107465,107527,107674
   + /trunk:107106,107465,107527,107674,107753


Property changes on: branches/release_2_2/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/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:106802,106807,106809,107106,107465,107527,107674
/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/gsoc11-rev-upgrade/base:78828-88375
/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:106802,106807,106809,107106,107465,107527,107674,107753
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_2/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/release_2_2/base/src/port1.0/portconfigure.tcl	2013-07-05 16:21:23 UTC (rev 107773)
+++ branches/release_2_2/base/src/port1.0/portconfigure.tcl	2013-07-05 16:39:03 UTC (rev 107774)
@@ -448,23 +448,23 @@
     } elseif {$xcodeversion == "none" || $xcodeversion == ""} {
         return {cc}
     } elseif {[vercmp $xcodeversion 4.7] >= 0} {
-        return {clang macports-llvm-gcc-4.2 apple-gcc-4.2 macports-clang-3.2}
+        return {clang macports-llvm-gcc-4.2 apple-gcc-4.2 macports-clang-3.3}
     } elseif {[vercmp $xcodeversion 4.2] >= 0} {
-        return {clang llvm-gcc-4.2 apple-gcc-4.2 macports-clang-3.2}
+        return {clang llvm-gcc-4.2 apple-gcc-4.2 macports-clang-3.3}
     } elseif {[vercmp $xcodeversion 4.0] >= 0} {
-        return {llvm-gcc-4.2 clang gcc-4.2 macports-clang-3.2 apple-gcc-4.2}
+        return {llvm-gcc-4.2 clang gcc-4.2 macports-clang-3.3 apple-gcc-4.2}
     } elseif {[vercmp $xcodeversion 3.2] >= 0} {
         if {$macosx_deployment_target == "10.4"} {
             # It's not the deployment target that is the issue, it's the
             # 10.4u SDK which base chooses if the deployment_target is set
             return {gcc-4.0}
         } else {
-            return {gcc-4.2 clang llvm-gcc-4.2 macports-clang-3.2 macports-llvm-gcc-4.2 apple-gcc-4.2 gcc-4.0}
+            return {gcc-4.2 clang llvm-gcc-4.2 macports-clang-3.3 macports-llvm-gcc-4.2 apple-gcc-4.2 gcc-4.0}
         }
     } elseif {[vercmp $xcodeversion 3.0] >= 0} {
-        return {gcc-4.2 apple-gcc-4.2 gcc-4.0 macports-clang-3.2}
+        return {gcc-4.2 apple-gcc-4.2 gcc-4.0 macports-clang-3.3}
     } else {
-        return {gcc-4.0 apple-gcc-4.2 gcc-3.3 macports-clang-3.2}
+        return {gcc-4.0 apple-gcc-4.2 gcc-3.3 macports-clang-3.3}
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130705/5551a606/attachment.html>