From cbd018a2db0b6a49b06cd197086d0a340dfc9f07 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 10 May 2014 17:10:40 -0500 Subject: [PATCH] Fix duplicate -stdlib flags in cxxld mode When the cc wrapper is in cxxld mode, -stdlib= is added by both cxxflags and ldflags, but they are never used separately, so this results in duplicate flags. --- Library/ENV/4.3/cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Library/ENV/4.3/cc b/Library/ENV/4.3/cc index d2c581d343..2647554ad9 100755 --- a/Library/ENV/4.3/cc +++ b/Library/ENV/4.3/cc @@ -271,12 +271,10 @@ class Cmd def ldflags args = path_flags("-L", libpath) case mode - when :ld then args << '-headerpad_max_install_names' - when :ccld then args << '-Wl,-headerpad_max_install_names' - when :cxxld - args << '-Wl,-headerpad_max_install_names' - args << '-stdlib=libc++' if cccfg? 'g' - args << '-stdlib=libstdc++' if cccfg? 'h' + when :ld + args << "-headerpad_max_install_names" + when :ccld, :cxxld + args << "-Wl,-headerpad_max_install_names" end args end