X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fgnucompiler.cpp;h=a6d27052e292e032123e4d5f1e7fbb94aa03c333;hb=69cdee2c53972c1dd7e1b9d83ddcd8f6c3c589f7;hp=8df1a72a92debc7542df10f137f76d29f1f8e18a;hpb=25a315f3cb5805614c513ac762ea1bd512ce82cb;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 8df1a72..a6d2705 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -40,7 +40,7 @@ Target *GnuCompiler::create_target(const list<Target *> &sources, const string &
 Task *GnuCompiler::run(const Target &target) const
 {
 	const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
-	const Component &comp = object.get_component();
+	const Component &comp = *object.get_component();
 
 	ExternalTask::Arguments argv;
 	argv.push_back(executable->get_path().str());
@@ -69,7 +69,7 @@ Task *GnuCompiler::run(const Target &target) const
 	}
 	if(binfo.threads)
 		argv.push_back("-pthread");
-	if(comp.get_type()==Component::LIBRARY)
+	if(comp.get_type()==Component::LIBRARY && architecture->get_system()!="windows")
 		argv.push_back("-fPIC");
 
 	const Architecture &native_arch = builder.get_native_arch();
@@ -82,7 +82,7 @@ Task *GnuCompiler::run(const Target &target) const
 
 	FS::Path obj_path = object.get_path();
 	FS::Path src_path = object.get_source().get_path();
-	FS::Path work_dir = comp.get_package().get_source();
+	FS::Path work_dir = comp.get_package().get_source_directory();
 
 	argv.push_back("-o");
 	argv.push_back(relative(obj_path, work_dir).str());