Add FPU specification to Architecture and GnuCompiler

[builder.git] / source / gnulinker.cpp

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index e266a8ea6123a53e59d4d06cc3666a04dbc7dc22..cc0a50d3ace1ef23db89835b4ad240bce64e4956 100644 (file)
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -27,6 +27,8 @@ GnuLinker::GnuLinker(Builder &b, const Architecture &a, const FS::Path &sysroot)
        input_suffixes.push_back(".o");
        input_suffixes.push_back(".a");
 
+       processing_unit = COMPONENT;
+
        if(!sysroot.empty())
        {
                build_info.sysroot = sysroot;
@@ -174,9 +176,7 @@ Task *GnuLinker::Linker::run(const Target &target) const
        vector<string> argv;
        argv.push_back(executable->get_path().str());
 
-       const Component &comp = *bin.get_component();
-
-       FS::Path work_dir = comp.get_package().get_source_directory();
+       FS::Path work_dir = bin.get_component()->get_package().get_source_directory();
 
        if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&bin))
        {
@@ -225,8 +225,14 @@ Task *GnuLinker::Linker::run(const Target &target) const
        argv.push_back("-o");
        argv.push_back(relative(bin.get_path(), work_dir).str());
 
+       for(BuildInfo::WordList::const_iterator i=binfo.keep_symbols.begin(); i!=binfo.keep_symbols.end(); ++i)
+               argv.push_back("-u"+*i);
+
        bool static_link_ok = (binfo.libmode<=BuildInfo::STATIC);
 
+       if(architecture->get_system()=="windows" && architecture->get_cross_prefix().find("mingw")!=string::npos)
+               argv.push_back("-lmingw32");
+
        const Target::Dependencies &depends = target.get_dependencies();
        for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
        {