Better encapsulation of config inside Package

[builder.git] / source / link.cpp

diff --git a/source/link.cpp b/source/link.cpp
index 8b4c56421089e34d8bee43ffbd378c28cfb1566d..2ff5a97e85060545194ab58b4832e219617bb542 100644 (file)
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -2,9 +2,13 @@
 #include "builder.h"
 #include "component.h"
 #include "executable.h"
+#include "install.h"
 #include "link.h"
 #include "objectfile.h"
 #include "package.h"
+#include "sharedlibrary.h"
+#include "staticlibrary.h"
+#include "systemlibrary.h"
 
 using namespace std;
 using namespace Msp;
@@ -14,25 +18,40 @@ Link::Link(Builder &b, const Executable &exe):
 {
        const Component &comp=exe.get_component();
 
-       argv.push_back("g++");
+       const string &prefix=b.get_arch_prefix(exe.get_package()->get_arch());
+
+       //XXX Determine whether to use g++ or gcc
+       argv.push_back(prefix+"g++");
        
        if(comp.get_type()==Component::LIBRARY)
                argv.push_back("-shared");
+       else if(comp.get_package().get_library_mode()==ALL_STATIC)
+               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);
-       for(list<string>::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
-               argv.push_back("-l"+*i);
        
        argv.push_back("-o");
        argv.push_back(exe.get_name());
-       const list<Target *> &deps=exe.get_depends();
-       for(list<Target *>::const_iterator i=deps.begin(); i!=deps.end(); ++i)
-               if(dynamic_cast<ObjectFile *>(*i))
+       const TargetList &deps=exe.get_depends();
+       for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+       {
+               Target *tgt=*i;
+               if(dynamic_cast<Install *>(tgt))
+                       tgt=tgt->get_depends().front();
+
+               if(dynamic_cast<ObjectFile *>(tgt))
+                       argv.push_back((*i)->get_name());
+               else if(SharedLibrary *shlib=dynamic_cast<SharedLibrary *>(tgt))
+                       argv.push_back("-l"+shlib->get_libname());
+               else if(dynamic_cast<StaticLibrary *>(tgt))
                        argv.push_back((*i)->get_name());
+               else if(SystemLibrary *syslib=dynamic_cast<SystemLibrary *>(tgt))
+                       argv.push_back("-l"+syslib->get_libname());
+       }
 
        Path::Path epath=exe.get_name();
        if(!builder.get_dry_run())