X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=bb7b68ff01f444f86ff747423d109ce30a8975ad;hb=f0042e452d1d2771eebbc9c54bd90e5218836a8b;hp=286f53b049cf8284b770821b0098fe58a4f2c77c;hpb=3585dea6eabf5f1565886bf09c2bdb2eee978912;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index 286f53b..bb7b68f 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -139,6 +139,7 @@ Builder::Builder(int argc, char **argv):
 	native_arch->set_tool("LXX", "g++");
 	native_arch->set_tool("AR",  "ar");
 
+	load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str());
 	load_build_file((FS::get_home_dir()/".builderrc").str());
 
 	if(arch.empty())
@@ -225,7 +226,8 @@ returned.
 Target *Builder::get_header(const string &include, const string &from, const list<string> &path)
 {
 	string hash(8, 0);
-	update_hash(hash, from);
+	if(include[0]=='\"')
+		update_hash(hash, from);
 	for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
 		update_hash(hash, *i);
 
@@ -261,7 +263,7 @@ Target *Builder::get_header(const string &include, const string &from, const lis
 		syspath.push_back("/usr/include");
 	else
 		syspath.push_back("/usr/"+current_arch->get_prefix()+"/include");
-	syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver/fn).str());
+	syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver).str());
 
 	Target *tgt=0;
 	if(include[0]=='\"')