[110679] trunk/dports/devel/ld64/Portfile

[jeremyhu at macports.org]

Revision: 110679
          https://trac.macports.org/changeset/110679
Author:   jeremyhu at macports.org
Date:     2013-09-03 08:44:17 -0700 (Tue, 03 Sep 2013)
Log Message:
-----------
ld64: Fix configure.cxx_stdlib support

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

Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile	2013-09-03 14:25:30 UTC (rev 110678)
+++ trunk/dports/devel/ld64/Portfile	2013-09-03 15:44:17 UTC (rev 110679)
@@ -145,20 +145,20 @@
     system "cd ${worksrcpath} && ${build.cmd} src/ld/configure.h"
 }
 
-set other_ldflags "${configure.ldflags} [get_canonical_archflags ld]"
+set cxx_stdlibflags {}
 if {[info exists configure.cxx_stdlib] &&
     ${configure.cxx_stdlib} ne {} &&
-    [string match *clang* ${configure.cxx}]
-} then {
-    append other_ldflags " -stdlib=${configure.cxx_stdlib}"
+    [string match *clang* ${configure.cxx}]} {
+    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
 }
+
 build.args \
     CC="${configure.cc}" \
     CXX="${configure.cxx}" \
     OTHER_CPPFLAGS="${configure.cppflags}" \
     OTHER_CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
-    OTHER_CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
-    OTHER_LDFLAGS="${other_ldflags}"
+    OTHER_CXXFLAGS="${configure.cxxflags} ${cxx_stdlibflags} [get_canonical_archflags cxx]" \
+    OTHER_LDFLAGS="${configure.ldflags} ${cxx_stdlibflags} [get_canonical_archflags ld]"
 
 if {${os.major} >= 11} {
     build.args-append \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130903/c4010157/attachment.html>