X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=0a69d7aa22f058641980b03768b8ccce030babb0;hb=f5d23e3e6ad425075182982c1ef717cb0873bbdc;hp=9e1b68dd43d60b4b81d61f2c65051412d7286fa6;hpb=e3407687a61bce56912b89818a9d9f006e9da41f;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 9e1b68d..0a69d7a 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -107,10 +107,17 @@ void SourcePackage::do_prepare()
 	{
 		string ident = "WITH_"+toupper(i->name);
 		string value = config.get_option("with_"+i->name).value;
-		if(!i->choices.empty())
-			build_info.defines[ident] = value;
-		else if(lexical_cast<bool>(value))
-			build_info.defines[ident] = "1";
+
+		if(i->choices.empty())
+		{
+			if(!lexical_cast<bool>(value))
+				continue;
+			value = "1";
+		}
+
+		build_info.defines[ident] = value;
+		if(i->exported)
+			export_binfo.defines[ident] = value;
 	}
 
 	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
@@ -126,13 +133,17 @@ void SourcePackage::do_prepare()
 	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
 		(*i)->create_targets();
 
+	const Architecture &arch = builder.get_native_arch();
 	if(!export_binfo.libs.empty())
 	{
 		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
 		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
 
-		PkgConfigFile *pc = new PkgConfigFile(builder, *this);
-		builder.get_build_graph().get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc));
+		if(arch.get_system()=="linux")
+		{
+			PkgConfigFile *pc = new PkgConfigFile(builder, *this);
+			builder.get_build_graph().get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc));
+		}
 	}
 }