Use GnuCompiler's build info to link libstdc++

[builder.git] / source / gnucompiler.cpp

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 4ee09ed5d97593c74c1130d509337ddec39b2ad0..0c5f2f8611db9eb588b8649fe3867f313153c5fc 100644 (file)
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -107,6 +107,9 @@ void GnuCompiler::do_prepare(ToolData &tool) const
        tool.extra_data = 0U;
        prepare_syspath(tool);
        prepare_version(tool);
+
+       if(tag=="CXX")
+               tool.build_info.libs.push_back("stdc++");
 }
 
 void GnuCompiler::prepare_syspath(ToolData &tool) const
@@ -195,20 +198,19 @@ unsigned GnuCompiler::query_version(const string &exe_path, const string &arg) c
        argv.push_back(arg);
 
        builder.get_logger().log("auxcommands", "Running %s", join(argv.begin(), argv.end()));
+       unsigned ver = 0;
        try
        {
                string version_str = strip(ExternalTask::run_and_capture_output(argv));
 
                vector<string> version_parts = split(version_str, '.');
-               unsigned ver = 0;
                for(unsigned i=0; (i<3 && i<version_parts.size()); ++i)
                        ver |= lexical_cast<unsigned>(version_parts[i])<<(16-8*i);
-               return ver;
        }
        catch(const runtime_error &)
        { }
 
-       return 0;
+       return ver;
 }
 
 Task *GnuCompiler::_run(const ObjectFile &object)