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

[jmr at macports.org]

Revision: 53405
          http://trac.macports.org/changeset/53405
Author:   jmr at macports.org
Date:     2009-07-04 20:43:44 -0700 (Sat, 04 Jul 2009)
Log Message:
-----------
check for existence of universal variant before adding universal flags

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

Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl	2009-07-05 03:38:11 UTC (rev 53404)
+++ trunk/base/src/port1.0/portconfigure.tcl	2009-07-05 03:43:44 UTC (rev 53405)
@@ -105,7 +105,7 @@
     global configure.universal_cflags
     
     set flags "${configure.optflags}"
-    if {[variant_isset universal]} {
+    if {[variant_exists universal] && [variant_isset universal]} {
         if {${configure.universal_cflags} != ""} {
             append flags " ${configure.universal_cflags}"
         }
@@ -128,7 +128,7 @@
 proc portconfigure::configure_get_cppflags {args} {
     global prefix configure.universal_cppflags
     set flags "-I${prefix}/include"
-    if {[variant_isset universal] && ${configure.universal_cppflags} != ""} {
+    if {[variant_exists universal] && [variant_isset universal] && ${configure.universal_cppflags} != ""} {
         append flags " ${configure.universal_cppflags}"
     }
     return $flags
@@ -137,7 +137,7 @@
 proc portconfigure::configure_get_ldflags {args} {
     global prefix configure.universal_ldflags configure.archflags
     set flags "-L${prefix}/lib"
-    if {[variant_isset universal] && ${configure.universal_ldflags} != ""} {
+    if {[variant_exists universal] && [variant_isset universal] && ${configure.universal_ldflags} != ""} {
         append flags " ${configure.universal_ldflags}"
     } elseif {${configure.archflags} != ""} {
         append flags " ${configure.archflags}"
@@ -217,7 +217,7 @@
 proc portconfigure::configure_get_pre_args {args} {
     global prefix configure.universal_args
     set result "--prefix=${prefix}"
-    if {[variant_isset universal] && ${configure.universal_args} != ""} {
+    if {[variant_exists universal] && [variant_isset universal] && ${configure.universal_args} != ""} {
         append result " ${configure.universal_args}"
     }
     return $result
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090704/47d648fe/attachment.html>