[102156] trunk/base/src/port1.0/portconfigure.tcl

[jeremyhu at macports.org]

Revision: 102156
          https://trac.macports.org/changeset/102156
Author:   jeremyhu at macports.org
Date:     2013-01-28 10:52:11 -0800 (Mon, 28 Jan 2013)
Log Message:
-----------
Update portconfigure::arch_flag_supported to take a compiler as an argument

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

Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl	2013-01-28 18:46:22 UTC (rev 102155)
+++ trunk/base/src/port1.0/portconfigure.tcl	2013-01-28 18:52:11 UTC (rev 102156)
@@ -293,7 +293,7 @@
     } elseif {[tbool configure.m32]} {
         set flags "-m32"
     } elseif {${configure.build_arch} != ""} {
-        if {[arch_flag_supported] && ($tool == "cc" || $tool == "cxx" || $tool == "objc")} {
+        if {[arch_flag_supported ${configure.compiler}] && ($tool == "cc" || $tool == "cxx" || $tool == "objc")} {
             set flags "-arch ${configure.build_arch}"
         } elseif {${configure.build_arch} == "x86_64" || ${configure.build_arch} == "ppc64"} {
             set flags "-m64"
@@ -310,7 +310,7 @@
 # ld directly. So we punt and let portfiles deal with that case.
 proc portconfigure::configure_get_ld_archflags {args} {
     global configure.build_arch
-    if {${configure.build_arch} != "" && [arch_flag_supported]} {
+    if {${configure.build_arch} != "" && [arch_flag_supported ${configure.compiler}]} {
         return "-arch ${configure.build_arch}"
     } else {
         return ""
@@ -363,9 +363,8 @@
 }
 
 # internal proc to determine if the compiler supports -arch
-proc portconfigure::arch_flag_supported {args} {
-    global configure.compiler
-    switch -exact ${configure.compiler} {
+proc portconfigure::arch_flag_supported {compiler} {
+    switch -exact ${compiler} {
         gcc-4.0 -
         gcc-4.2 -
         llvm-gcc-4.2 -
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130128/1f431dca/attachment-0001.html>