Move some install location assignments to more logical places

[builder.git] / source / gnulinker.cpp

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index 45cfd7fff4fc2b98c134c57fffdda78d9d3e8b42..a8b07f8499bdc8307a8378a93c46147dbb70ad5e 100644 (file)
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -2,6 +2,7 @@
 #include <vector>
 #include <msp/fs/dir.h>
 #include <msp/fs/utils.h>
+#include <msp/strings/format.h>
 #include "builder.h"
 #include "component.h"
 #include "executable.h"
@@ -53,8 +54,8 @@ Task *GnuLinker::run(const Target &target) const
 
        string command = "gcc";
 
-       const list<Target *> &depends = target.get_depends();
-       for(list<Target *>::const_iterator i=depends.begin(); i!=depends.end(); ++i)
+       const Target::Dependencies &depends = target.get_depends();
+       for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
                if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
                {
                        const Tool *tool = obj->get_tool();
@@ -70,6 +71,7 @@ Task *GnuLinker::run(const Target &target) const
        if(shlib)
        {
                argv.push_back("-shared");
+               argv.push_back("-fPIC");
                if(!shlib->get_soname().empty())
                        argv.push_back("-Wl,-soname,"+shlib->get_soname());
        }
@@ -77,16 +79,23 @@ Task *GnuLinker::run(const Target &target) const
                argv.push_back("-static");
 
        const BuildInfo &binfo = comp.get_build_info();
-       for(list<string>::const_iterator i=binfo.ldflags.begin(); i!=binfo.ldflags.end(); ++i)
-               argv.push_back(*i);
        for(list<string>::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
                argv.push_back("-L"+*i);
+       if(binfo.strip)
+               argv.push_back("-s");
+       if(binfo.threads)
+               argv.push_back("-pthread");
+
+       const Architecture &arch = builder.get_current_arch();
+       const Architecture &native_arch = builder.get_native_arch();
+       if(arch.get_bits()!=native_arch.get_bits())
+               argv.push_back(format("-m%d", arch.get_bits()));
 
        FS::Path work_dir = comp.get_package().get_source();
 
        argv.push_back("-o");
        argv.push_back(relative(bin.get_path(), work_dir).str());
-       for(TargetList::const_iterator i=depends.begin(); i!=depends.end(); ++i)
+       for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
        {
                Target *tgt = (*i)->get_real_target();