Add build info to tools and use it to pass runtime libs

[builder.git] / source / gnucompiler.cpp

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index bff5f8cd145106520005052184d04da274e4ae90..16e24c0090c5bf43a45cd3d69a0559ddcb56acd9 100644 (file)
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -81,7 +81,9 @@ Task *GnuCompiler::run(const Target &target) const
        argv.push_back(executable->get_path().str());
        argv.push_back("-c");
 
-       const BuildInfo &binfo = comp.get_build_info_for_path(object.get_source().get_path());
+       BuildInfo binfo;
+       target.collect_build_info(binfo);
+
        if(binfo.warning_level>=1)
        {
                argv.push_back("-Wall");
@@ -142,7 +144,7 @@ Task *GnuCompiler::run(const Target &target) const
                argv.push_back("-fPIC");
 
        const Architecture &native_arch = builder.get_native_arch();
-       if(architecture->get_bits()!=native_arch.get_bits())
+       if(architecture->is_native() && architecture->get_bits()!=native_arch.get_bits())
                argv.push_back(format("-m%d", architecture->get_bits()));
 
        const string &cpu = architecture->get_cpu();