Revision: 110521 https://trac.macports.org/changeset/110521 Author: larryv@macports.org Date: 2013-08-31 22:24:17 -0700 (Sat, 31 Aug 2013) Log Message: ----------- gcc*: Clear configure.cxx_stdlib instead of filtering configure.cxxflags. Modified Paths: -------------- trunk/dports/lang/gcc43/Portfile trunk/dports/lang/gcc44/Portfile trunk/dports/lang/gcc45/Portfile trunk/dports/lang/gcc46/Portfile trunk/dports/lang/gcc47/Portfile trunk/dports/lang/gcc48/Portfile trunk/dports/lang/gcc49/Portfile Modified: trunk/dports/lang/gcc43/Portfile =================================================================== --- trunk/dports/lang/gcc43/Portfile 2013-09-01 05:02:05 UTC (rev 110520) +++ trunk/dports/lang/gcc43/Portfile 2013-09-01 05:24:17 UTC (rev 110521) @@ -117,9 +117,10 @@ # http://trac.macports.org/ticket/29104 compiler.blacklist-append {llvm-gcc-4.2 < 2336.1} -# These would be passed on to the bootstrap compiler if present, so just strip them -configure.cxxflags-delete -stdlib=libc++ -configure.cxxflags-delete -stdlib=libstdc++ +# "-stdlib" would be passed on to the bootstrap compiler if present +if {[info exists configure.cxx_stdlib]} { + configure.cxx_stdlib +} # STAGE1_CFLAGS="-O2 -fkeep-inline-functions" : from configure.ac # BOOT_CFLAGS="-O2 -g" : from Makefile.tpl Modified: trunk/dports/lang/gcc44/Portfile =================================================================== --- trunk/dports/lang/gcc44/Portfile 2013-09-01 05:02:05 UTC (rev 110520) +++ trunk/dports/lang/gcc44/Portfile 2013-09-01 05:24:17 UTC (rev 110521) @@ -118,9 +118,10 @@ # http://trac.macports.org/ticket/29104 compiler.blacklist-append {llvm-gcc-4.2 < 2336.1} -# These would be passed on to the bootstrap compiler if present, so just strip them -configure.cxxflags-delete -stdlib=libc++ -configure.cxxflags-delete -stdlib=libstdc++ +# "-stdlib" would be passed on to the bootstrap compiler if present +if {[info exists configure.cxx_stdlib]} { + configure.cxx_stdlib +} # STAGE1_CFLAGS="-O2 -fkeep-inline-functions" : from configure.ac # BOOT_CFLAGS="-O2 -g" : from Makefile.tpl Modified: trunk/dports/lang/gcc45/Portfile =================================================================== --- trunk/dports/lang/gcc45/Portfile 2013-09-01 05:02:05 UTC (rev 110520) +++ trunk/dports/lang/gcc45/Portfile 2013-09-01 05:24:17 UTC (rev 110521) @@ -138,9 +138,10 @@ configure.args-append --enable-lto } -# These would be passed on to the bootstrap compiler if present, so just strip them -configure.cxxflags-delete -stdlib=libc++ -configure.cxxflags-delete -stdlib=libstdc++ +# "-stdlib" would be passed on to the bootstrap compiler if present +if {[info exists configure.cxx_stdlib]} { + configure.cxx_stdlib +} build.dir ${configure.dir} build.target bootstrap Modified: trunk/dports/lang/gcc46/Portfile =================================================================== --- trunk/dports/lang/gcc46/Portfile 2013-09-01 05:02:05 UTC (rev 110520) +++ trunk/dports/lang/gcc46/Portfile 2013-09-01 05:24:17 UTC (rev 110521) @@ -122,9 +122,10 @@ # http://trac.macports.org/ticket/29104 compiler.blacklist-append {llvm-gcc-4.2 < 2336.1} -# These would be passed on to the bootstrap compiler if present, so just strip them -configure.cxxflags-delete -stdlib=libc++ -configure.cxxflags-delete -stdlib=libstdc++ +# "-stdlib" would be passed on to the bootstrap compiler if present +if {[info exists configure.cxx_stdlib]} { + configure.cxx_stdlib +} build.dir ${configure.dir} build.target bootstrap Modified: trunk/dports/lang/gcc47/Portfile =================================================================== --- trunk/dports/lang/gcc47/Portfile 2013-09-01 05:02:05 UTC (rev 110520) +++ trunk/dports/lang/gcc47/Portfile 2013-09-01 05:24:17 UTC (rev 110521) @@ -121,9 +121,10 @@ # http://trac.macports.org/ticket/29104 compiler.blacklist-append {llvm-gcc-4.2 < 2336.1} -# These would be passed on to the bootstrap compiler if present, so just strip them -configure.cxxflags-delete -stdlib=libc++ -configure.cxxflags-delete -stdlib=libstdc++ +# "-stdlib" would be passed on to the bootstrap compiler if present +if {[info exists configure.cxx_stdlib]} { + configure.cxx_stdlib +} build.dir ${configure.dir} build.target bootstrap Modified: trunk/dports/lang/gcc48/Portfile =================================================================== --- trunk/dports/lang/gcc48/Portfile 2013-09-01 05:02:05 UTC (rev 110520) +++ trunk/dports/lang/gcc48/Portfile 2013-09-01 05:24:17 UTC (rev 110521) @@ -97,9 +97,10 @@ # http://trac.macports.org/ticket/29104 compiler.blacklist-append {llvm-gcc-4.2 < 2336.1} -# These would be passed on to the bootstrap compiler if present, so just strip them -configure.cxxflags-delete -stdlib=libc++ -configure.cxxflags-delete -stdlib=libstdc++ +# "-stdlib" would be passed on to the bootstrap compiler if present +if {[info exists configure.cxx_stdlib]} { + configure.cxx_stdlib +} build.dir ${configure.dir} build.target bootstrap Modified: trunk/dports/lang/gcc49/Portfile =================================================================== --- trunk/dports/lang/gcc49/Portfile 2013-09-01 05:02:05 UTC (rev 110520) +++ trunk/dports/lang/gcc49/Portfile 2013-09-01 05:24:17 UTC (rev 110521) @@ -98,9 +98,10 @@ # http://trac.macports.org/ticket/29104 compiler.blacklist-append {llvm-gcc-4.2 < 2336.1} -# These would be passed on to the bootstrap compiler if present, so just strip them -configure.cxxflags-delete -stdlib=libc++ -configure.cxxflags-delete -stdlib=libstdc++ +# "-stdlib" would be passed on to the bootstrap compiler if present +if {[info exists configure.cxx_stdlib]} { + configure.cxx_stdlib +} build.dir ${configure.dir} build.target bootstrap