X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildercli.cpp;h=7482aced39c9923a51083eb3d71b6cd2483956b4;hb=3af85a03554609af06e8f182f59f97fbcbb469ec;hp=c0a4f06c8f10c1b692b39c7a79798cf361a362e6;hpb=64661ac00a3a7eaa2295b85be642b6c96276cf97;p=builder.git

diff --git a/source/buildercli.cpp b/source/buildercli.cpp
index c0a4f06..7482ace 100644
--- a/source/buildercli.cpp
+++ b/source/buildercli.cpp
@@ -8,6 +8,8 @@
 #include "buildercli.h"
 #include "filetarget.h"
 #include "sourcepackage.h"
+#include "tool.h"
+#include "toolchain.h"
 
 using namespace std;
 using namespace Msp;
@@ -142,7 +144,7 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
 
 	package_manager.append_package_path(cwd);
 	package_manager.append_package_path(cwd/"..");
-	package_manager.append_binary_package_path(FS::get_sys_data_dir(argv[0], "builder"));
+	package_manager.append_binary_package_path(FS::get_sys_data_dir(argv[0], "builder")/"packages");
 
 	package_manager.set_no_externals(no_externals);
 
@@ -165,6 +167,18 @@ BuilderCLI::BuilderCLI(int argc, char **argv):
 		builder.set_build_type(build_type);
 
 	builder.add_default_tools();
+
+	const Toolchain &toolchain = builder.get_toolchain();
+	for(Config::InputOptions::iterator i=cmdline_options.begin(); i!=cmdline_options.end(); )
+	{
+		if(toolchain.has_tool(i->first))
+		{
+			toolchain.get_tool(i->first).set_command(i->second);
+			cmdline_options.erase(i++);
+		}
+		else
+			++i;
+	}
 }
 
 BuilderCLI::~BuilderCLI()