Fix some usages of get_current_arch() inside Builder

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index 9be7f6c8eec3cbf57c5dc67d9556ec7a5c8c68a2..dda6c6148df51a7c726f1b1bf0e1258d9c48104e 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -181,7 +181,7 @@ Gets a package by name, possibly creating it.
 */
 Package *Builder::get_package(const string &name)
 {
-       PackageMap::iterator i=packages.find(format("%s/%s", name, current_arch));
+       PackageMap::iterator i=packages.find(format("%s/%s", name, current_arch->get_name()));
        if(i==packages.end())
                i=packages.find(name);
        if(i!=packages.end())
@@ -240,7 +240,7 @@ Target *Builder::get_header(const string &include, const string &from, const lis
        if(cxx_ver.empty())
        {
                StringList argv;
-               argv.push_back(get_current_arch().get_tool("CXX"));
+               argv.push_back(current_arch->get_tool("CXX"));
                argv.push_back("--version");
                cxx_ver=Regex("[0-9]\\.[0-9.]+").match(run_command(argv))[0].str;
                while(!cxx_ver.empty() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver))
@@ -307,7 +307,7 @@ Target *Builder::get_library(const string &lib, const list<string> &path, LibMod
                syspath.push_back("/usr/lib");
        }
        else
-               syspath.push_back("/usr/"+get_current_arch().get_prefix()+"/lib");
+               syspath.push_back("/usr/"+current_arch->get_prefix()+"/lib");
 
        if(verbose>=5)
                cout<<"Looking for library "<<lib<<" with path "<<join(path.begin(), path.end())<<'\n';