[46624] branches/release_1_7/base

[ryandesign at macports.org]

Revision: 46624
          http://trac.macports.org/changeset/46624
Author:   ryandesign at macports.org
Date:     2009-02-08 17:59:59 -0800 (Sun, 08 Feb 2009)
Log Message:
-----------
Allow apple-gcc-4.2 to be used for configure.compiler (merged r46622 and r46623 from trunk to release_1_7 branch)

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

Property Changed:
----------------
    branches/release_1_7/base/


Property changes on: branches/release_1_7/base
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46622-46623
/trunk/base/base:45161

Modified: branches/release_1_7/base/ChangeLog
===================================================================
--- branches/release_1_7/base/ChangeLog	2009-02-09 01:54:18 UTC (rev 46623)
+++ branches/release_1_7/base/ChangeLog	2009-02-09 01:59:59 UTC (rev 46624)
@@ -5,6 +5,8 @@
 
 
 Release 1.7.1 (unreleased):
+    - Add 'apple-gcc-4.2' option to configure.compiler (#18426, ryandesign)
+
     - Create ${applications_dir} and ${frameworks_dir} in destroot
       automatically (r45614, raimue)
 

Modified: branches/release_1_7/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/release_1_7/base/src/port1.0/portconfigure.tcl	2009-02-09 01:54:18 UTC (rev 46623)
+++ branches/release_1_7/base/src/port1.0/portconfigure.tcl	2009-02-09 01:59:59 UTC (rev 46624)
@@ -152,6 +152,7 @@
         llvm-gcc-4.2 { set name "Mac OS X llvm-gcc 4.2" }
         apple-gcc-3.3 { set name "MacPorts Apple gcc 3.3" }
         apple-gcc-4.0 { set name "MacPorts Apple gcc 4.0" }
+        apple-gcc-4.2 { set name "MacPorts Apple gcc 4.2" }
         macports-gcc-3.3 { set name "MacPorts gcc 3.3" }
         macports-gcc-3.4 { set name "MacPorts gcc 3.4" }
         macports-gcc-4.0 { set name "MacPorts gcc 4.0" }
@@ -315,6 +316,13 @@
                 cpp  { set ret ${prefix}/bin/cpp-apple-4.0 }
             }
         }
+        apple-gcc-4.2 {
+            switch -exact ${type} {
+                cc   { set ret ${prefix}/bin/gcc-apple-4.2 }
+                objc { set ret ${prefix}/bin/gcc-apple-4.2 }
+                cpp  { set ret ${prefix}/bin/cpp-apple-4.2 }
+            }
+        }
         macports-gcc-3.3 {
             switch -exact ${type} {
                 cc  { set ret ${prefix}/bin/gcc-mp-3.3 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090208/ced5a060/attachment.html>