[107973] trunk/base/src/port1.0

[larryv at macports.org]

Revision: 107973
          https://trac.macports.org/changeset/107973
Author:   larryv at macports.org
Date:     2013-07-09 20:39:04 -0700 (Tue, 09 Jul 2013)
Log Message:
-----------
Add explicit "configure.universal_objcflags" option, defaulting to ${configure.universal_cflags}.

This obviates the need to special-case "objc" in get_canonical_archflags.

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

Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl	2013-07-10 03:30:53 UTC (rev 107972)
+++ trunk/base/src/port1.0/portconfigure.tcl	2013-07-10 03:39:04 UTC (rev 107973)
@@ -169,11 +169,13 @@
 
 options configure.universal_archs configure.universal_args \
         configure.universal_cflags configure.universal_cxxflags \
+        configure.universal_objcflags \
         configure.universal_cppflags configure.universal_ldflags
 default configure.universal_archs       {[portconfigure::choose_supported_archs ${universal_archs}]}
 default configure.universal_args        {--disable-dependency-tracking}
 default configure.universal_cflags      {[portconfigure::configure_get_universal_cflags]}
 default configure.universal_cxxflags    {[portconfigure::configure_get_universal_cflags]}
+default configure.universal_objcflags   {${configure.universal_cflags}}
 default configure.universal_cppflags    {}
 default configure.universal_ldflags     {[portconfigure::configure_get_universal_ldflags]}
 

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2013-07-10 03:30:53 UTC (rev 107972)
+++ trunk/base/src/port1.0/portutil.tcl	2013-07-10 03:39:04 UTC (rev 107973)
@@ -3012,7 +3012,7 @@
     if {![variant_exists universal] || ![variant_isset universal]} {
         return [option configure.${tool}_archflags]
     } else {
-        if {$tool == "cc" || $tool == "objc"} {
+        if {$tool == "cc"} {
             set tool c
         }
         return [option configure.universal_${tool}flags]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130709/b90d3751/attachment.html>