X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fexecutable.cpp;h=9cd493d01c440935050cd51a6f70be65e9b8a5f0;hb=bf0883b6dd3946612922aa1b7c04a87d06442df7;hp=2460f024d0f3f04647a3ba80279409c1639d1b48;hpb=2606b03da59dc10e3826b833a2fceb0831d79972;p=builder.git diff --git a/source/executable.cpp b/source/executable.cpp index 2460f02..9cd493d 100644 --- a/source/executable.cpp +++ b/source/executable.cpp @@ -6,14 +6,12 @@ using namespace std; using namespace Msp; -Executable::Executable(Builder &b, const Component &c, const std::list &objs): - Binary(b, c, generate_filename(c), objs) -{ - install_location = "bin"; -} +Executable::Executable(Builder &b, const FS::Path &p): + Binary(b, p) +{ } -string Executable::generate_filename(const Component &comp) +Executable::Executable(Builder &b, const Component &c, const list &objs): + Binary(b, c, b.get_current_arch().create_filename(c.get_name()), objs) { - const Architecture &arch = comp.get_package().get_builder().get_current_arch(); - return arch.get_executable_patterns().front().apply(comp.get_name()); + install_location = "bin"; }