X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnuarchiver.cpp;h=158a4d4fee9f70c359d4e22ea1c6255aa82c098f;hb=74ea8208bb1aa1d9afc9657a4cdfac6714241887;hp=3499204954593db5587280e5d1679b514f2e2215;hpb=33d74db3e99f35a8984d4ad9b703f709d07d44c5;p=builder.git diff --git a/source/gnuarchiver.cpp b/source/gnuarchiver.cpp index 3499204..158a4d4 100644 --- a/source/gnuarchiver.cpp +++ b/source/gnuarchiver.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include #include "builder.h" #include "component.h" @@ -17,15 +16,11 @@ using namespace Msp; GnuArchiver::GnuArchiver(Builder &b, const Architecture &a): Tool(b, a, "AR") { - string command = "ar"; - if(architecture->is_cross()) - command = format("%s-%s", architecture->get_cross_prefix(), command); - executable = builder.get_vfs().find_binary(command); - + set_command("ar", true); input_suffixes.push_back(".o"); } -Target *GnuArchiver::create_target(const list &sources, const string &) const +Target *GnuArchiver::create_target(const list &sources, const string &) { if(sources.empty()) throw invalid_argument("GnuArchiver::create_target"); @@ -45,6 +40,11 @@ Target *GnuArchiver::create_target(const list &sources, const string & return lib; } +string GnuArchiver::create_build_signature(const BuildInfo &) const +{ + return FS::basename(executable->get_path()); +} + Task *GnuArchiver::run(const Target &target) const { const StaticLibrary &lib = dynamic_cast(target);