X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=d2ea51e96c9a3e36387f0f64198aa2c4242443f9;hb=08015c0f27f377fcd4aa186fca5bd8cf70723a5a;hp=f7982f7a626c9ac927c2e20b7db42794a72416ff;hpb=69cdee2c53972c1dd7e1b9d83ddcd8f6c3c589f7;p=builder.git diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp index f7982f7..d2ea51e 100644 --- a/source/gnulinker.cpp +++ b/source/gnulinker.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include "builder.h" #include "component.h" #include "executable.h" @@ -105,6 +106,21 @@ Target *GnuLinker::Linker::create_target(const list &sources, const st return parent.create_target(sources, arg); } +string GnuLinker::Linker::create_build_signature(const BuildInfo &binfo) const +{ + string result = FS::basename(executable->get_path()); + result += ','; + if(binfo.libmode<=BuildInfo::STATIC) + result += 't'; + else + result += 'd'; + if(binfo.strip) + result += 's'; + result += ",l"; + result += join(binfo.libs.begin(), binfo.libs.end(), ",l"); + return result; +} + Task *GnuLinker::Linker::run(const Target &target) const { const Binary &bin = dynamic_cast(target); @@ -159,9 +175,8 @@ Task *GnuLinker::Linker::run(const Target &target) const if(static_link_ok) argv.push_back("-static"); - - if(!builder.get_dry_run()) - FS::mkpath(FS::dirname(bin.get_path()), 0755); + else if(architecture->get_system()=="windows") + argv.push_back("-Wl,--enable-auto-import"); return new ExternalTask(argv, work_dir); }