[110680] trunk/dports/devel/cctools/Portfile

[jeremyhu at macports.org]

Revision: 110680
          https://trac.macports.org/changeset/110680
Author:   jeremyhu at macports.org
Date:     2013-09-03 08:46:43 -0700 (Tue, 03 Sep 2013)
Log Message:
-----------
cctools: Make configure.cxx_stdlib consistent with ld64

Modified Paths:
--------------
    trunk/dports/devel/cctools/Portfile

Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile	2013-09-03 15:44:17 UTC (rev 110679)
+++ trunk/dports/devel/cctools/Portfile	2013-09-03 15:46:43 UTC (rev 110680)
@@ -117,13 +117,11 @@
 
 build.target    all
 
+set cxx_stdlibflags {}
 if {[info exists configure.cxx_stdlib] &&
     ${configure.cxx_stdlib} ne {} &&
-    [string match *clang* ${configure.cxx}]
-} then {
-    set stdlib_flag " -stdlib=${configure.cxx_stdlib}"
-} else {
-    set stdlib_flag {}
+    [string match *clang* ${configure.cxx}]} {
+    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
 }
 
 pre-build {
@@ -132,7 +130,7 @@
         USE_DEPENDENCY_FILE=NO \
         BUILD_DYLIBS=NO \
         CC="${configure.cc} ${configure.cflags}" \
-        CXX="${configure.cxx} ${configure.cxxflags}${stdlib_flag}" \
+        CXX="${configure.cxx} ${configure.cxxflags} ${cxx_stdlibflags}" \
         RC_ARCHS="[get_canonical_archs]" \
         SDK="-I${prefix}/include"
 
@@ -162,7 +160,7 @@
         USE_DEPENDENCY_FILE=NO \
         BUILD_DYLIBS=NO \
         CC="${configure.cc} ${configure.cflags}" \
-        CXX="${configure.cxx} ${configure.cxxflags}${stdlib_flag}" \
+        CXX="${configure.cxx} ${configure.cxxflags} ${cxx_stdlibflags}" \
         RC_ARCHS="[get_canonical_archs]" \
         SDK="-I${prefix}/include"
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130903/349bc41f/attachment.html>