X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvirtualfilesystem.cpp;h=e240fb9e777b74590f39dfe23d2d417d18fb7303;hb=2193df46d4e7721dbb99ce744fbc884c2447e1f9;hp=820fb5b670bfc600a6df879bdc2c15f26ef39452;hpb=f5413fd8f007164591af26be9ded15ee7c707540;p=builder.git

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index 820fb5b..e240fb9 100644
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -1,4 +1,4 @@
-#include <cstdlib>
+#include <msp/core/environ.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/io/print.h>
@@ -85,12 +85,17 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
 	const Architecture &arch = builder.get_current_arch();
 
 	list<string> shared_names;
+	bool use_import_lib = false;
 	if(mode!=BuildInfo::FORCE_STATIC)
-		shared_names = Pattern::apply_list(arch.get_shared_library_patterns(), lib);
+	{
+		shared_names = Pattern::apply_list(arch.get_patterns<ImportLibrary>(), lib);
+		if(!(use_import_lib = !shared_names.empty()))
+			shared_names = Pattern::apply_list(arch.get_patterns<SharedLibrary>(), lib);
+	}
 
 	list<string> static_names;
 	if(mode!=BuildInfo::FORCE_DYNAMIC)
-		static_names = Pattern::apply_list(arch.get_static_library_patterns(), lib);
+		static_names = Pattern::apply_list(arch.get_patterns<StaticLibrary>(), lib);
 
 	for(list<FS::Path>::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i)
 	{
@@ -108,10 +113,7 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
 				builder.get_logger().log("vfs", format("Library %s (%s) found in %s", lib, *j, i->str()));
 				if(cur_names==&shared_names)
 				{
-					/* XXX Hack: create ImportLibraries here; they should be handled
-					separately, but I need a more generic way of handling all these
-					filename patterns */
-					if(FS::extpart(*j)==".a")
+					if(use_import_lib)
 						return new ImportLibrary(builder, filename);
 					return new SharedLibrary(builder, filename);
 				}
@@ -142,16 +144,20 @@ FileTarget *VirtualFileSystem::find_binary(const string &name)
 	SearchPath path;
 	if(FS::Path(name).is_absolute())
 		path.push_back("/");
-	else if(const char *env_path = getenv("PATH"))
-	{
-		vector<string> parts = split(env_path, ':');
-		for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-			path.push_back(*i);
-	}
 	else
 	{
-		path.push_back("/bin");
-		path.push_back("/usr/bin");
+		string env_path = Msp::getenv("PATH");
+		if(!env_path.empty())
+		{
+			vector<string> parts = split(env_path, ':');
+			for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+				path.push_back(*i);
+		}
+		else
+		{
+			path.push_back("/bin");
+			path.push_back("/usr/bin");
+		}
 	}
 
 	for(SearchPath::const_iterator i=path.begin(); i!=path.end(); ++i)