Change arch and prefix to global options

[builder.git] / source / executable.cpp

diff --git a/source/executable.cpp b/source/executable.cpp
index 076728c833ae81c5f2a35d0f9035f84406b3f098..ea2f4e0204684cb94ea25799fcd57e50a8029040 100644 (file)
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -44,12 +44,11 @@ void Executable::find_depends()
                queue.erase(queue.begin());
 
                const StringList &libpath=c->get_build_info().libpath;
-               const string &arch=c->get_package().get_arch();
 
                const list<string> &libs=c->get_build_info().libs;
                for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
                {
-                       Target *lib=builder.get_library(*i, arch, libpath, libmode);
+                       Target *lib=builder.get_library(*i, libpath, libmode);
                        if(lib)
                        {
                                dep_libs.push_back(lib);
@@ -89,8 +88,9 @@ we need to pass the value to the Target c'tor.
 */
 string Executable::generate_target_name(const Component &c)
 {
+       const SourcePackage &pkg=c.get_package();
        string prefix, suffix;
-       const string &arch=c.get_package().get_arch();
+       const string &arch=pkg.get_builder().get_current_arch().get_name();
 
        if(c.get_type()==Component::LIBRARY)
        {
@@ -108,5 +108,5 @@ string Executable::generate_target_name(const Component &c)
                        suffix=".exe";
        }
 
-       return (c.get_package().get_out_dir()/(prefix+c.get_name()+suffix)).str();
+       return (pkg.get_out_dir()/(prefix+c.get_name()+suffix)).str();
 }