Some fixes to library and header searching

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index 15c9e5455f84e0946fc01ef8c569181063d79394..caf7fe54eb10bf4a618c750f0235fc61936ed425 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -217,7 +217,7 @@ Target *Builder::get_header(const string &include, const string &arch, const str
                StringList argv;
                argv.push_back(get_architecture(arch).get_tool("CXX"));
                argv.push_back("--version");
-               cxx_ver=Regex(" ([0-9.]+) ").match(run_command(argv))[1].str;
+               cxx_ver=Regex("[0-9]\\.[0-9.]+").match(run_command(argv))[0].str;
                while(!cxx_ver.empty() && !exists(Path("/usr/include/c++")/cxx_ver))
                {
                        unsigned dot=cxx_ver.rfind('.');
@@ -234,8 +234,6 @@ Target *Builder::get_header(const string &include, const string &arch, const str
                cout<<"Looking for include "<<fn<<" with path "<<join(path.begin(), path.end())<<'\n';
 
        StringList syspath;
-       if(include[0]=='\"')
-               syspath.push_back(from);
        if(arch=="native")
                syspath.push_back("/usr/include");
        else
@@ -243,6 +241,8 @@ Target *Builder::get_header(const string &include, const string &arch, const str
        syspath.push_back((Path("/usr/include/c++/")/cxx_ver/fn).str());
 
        Target *tgt=0;
+       if(include[0]=='\"')
+               tgt=get_header(Path(from)/fn);
        for(list<string>::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
                tgt=get_header(cwd/ *j/fn);
        for(list<string>::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
@@ -608,7 +608,10 @@ Target *Builder::get_library(const string &lib, const string &arch, const Path &
        if(mode!=ALL_STATIC)
        {
                if(arch=="win32")
+               {
                        candidates.push_back("lib"+lib+".dll");
+                       candidates.push_back(lib+".dll");
+               }
                else
                        candidates.push_back("lib"+lib+".so");
        }