X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=15c9e5455f84e0946fc01ef8c569181063d79394;hb=69ad3610053e140cb5108f53e4c46a0583e33559;hp=d9444ce8a2c878d1eed9e4f9a80456460d43ccbc;hpb=76be6f9f3d6ed0b39044938fa7e424284627eac5;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index d9444ce..15c9e54 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -8,7 +8,7 @@ Distributed under the LGPL
 #include <fstream>
 #include <iostream>
 #include <set>
-#include <msp/core/error.h>
+#include <msp/core/except.h>
 #include <msp/core/getopt.h>
 #include <msp/datafile/parser.h>
 #include <msp/path/utils.h>
@@ -239,14 +239,14 @@ Target *Builder::get_header(const string &include, const string &arch, const str
 	if(arch=="native")
 		syspath.push_back("/usr/include");
 	else
-		syspath.push_back("/usr/"+get_architecture(arch).get_prefix()+"/lib");
+		syspath.push_back("/usr/"+get_architecture(arch).get_prefix()+"/include");
 	syspath.push_back((Path("/usr/include/c++/")/cxx_ver/fn).str());
 
 	Target *tgt=0;
-	for(list<string>::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
-		tgt=get_header(Path(*j)/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)
+		tgt=get_header(Path(*j)/fn);
 
 	includes.insert(TargetMap::value_type(id, tgt));
 
@@ -289,10 +289,10 @@ Target *Builder::get_library(const string &lib, const string &arch, const list<s
 		cout<<"Looking for library "<<lib<<" with path "<<join(path.begin(), path.end())<<'\n';
 
 	Target *tgt=0;
-	for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
-		tgt=get_library(lib, arch, *j, mode);
 	for(StringList::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
 		tgt=get_library(lib, arch, cwd/ *j, mode);
+	for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
+		tgt=get_library(lib, arch, *j, mode);
 
 	libraries.insert(TargetMap::value_type(id, tgt));