X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=9da79739d56854130f42d5fdbf58963557fa9450;hb=f5d3127099bc41f986094eb98732849ee9bfb748;hp=ef0e60cbb7b2a3373dea85d6da7e50a5426ac6bd;hpb=0f5283a54fd188072eca23fbd980a43c6c869913;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index ef0e60c..9da7973 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -19,7 +19,7 @@ using namespace Msp;
 /**
 Creates a buildable package.
 */
-SourcePackage::SourcePackage(Builder &b, const string &n, const Path &s):
+SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s):
 	Package(b, n),
 	source(s),
 	config(*this),
@@ -28,14 +28,18 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const Path &s):
 	tar_files.push_back(source/"Build");
 }
 
-Msp::Path SourcePackage::get_temp_dir() const
+Msp::FS::Path SourcePackage::get_temp_dir() const
 {
 	return source/config.get_option("tempdir").value/builder.get_current_arch().get_name()/config.get_option("profile").value;
 }
 
-Msp::Path SourcePackage::get_out_dir() const
+Msp::FS::Path SourcePackage::get_out_dir() const
 {
-	return source/config.get_option("outdir").value;
+	const std::string &arch_name=builder.get_current_arch().get_name();
+	if(arch_name=="native")
+		return source/config.get_option("outdir").value;
+	else
+		return source/arch_name/config.get_option("outdir").value;
 }
 
 /**
@@ -172,22 +176,19 @@ void SourcePackage::create_build_info()
 		export_binfo.defines.insert(export_binfo.defines.end(), ebi.defines.begin(), ebi.defines.end());
 	}
 
-	build_info.cflags.push_back("-Wall");
-	build_info.cflags.push_back("-Wshadow");
-	build_info.cflags.push_back("-Wextra");
-	build_info.cflags.push_back("-Wpointer-arith");
-	build_info.cflags.push_back("-Wconversion");
-	build_info.cflags.push_back("-Werror");
+	// XXX Currently, a package-specific settings will override cmdline.  This might or might not be desirable.
+	const StringList &warnings=builder.get_warnings();
+	build_info.warnings.insert(build_info.warnings.begin(), warnings.begin(), warnings.end());
 
 	unsigned flags=get_install_flags();
 
-	build_info.incpath.push_back((Path(builder.get_prefix())/"include").str());
-	build_info.libpath.push_back((Path(builder.get_prefix())/"lib").str());
+	build_info.incpath.push_back((builder.get_prefix()/"include").str());
+	build_info.libpath.push_back((builder.get_prefix()/"lib").str());
 
 	if(flags&INCLUDE)
-		export_binfo.incpath.push_back((Path(builder.get_prefix())/"include").str());
+		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
 	if(flags&LIB)
-		export_binfo.libpath.push_back((Path(builder.get_prefix())/"lib").str());
+		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
 
 	string optimize=config.get_option("optimize").value;
 	if(lexical_cast<unsigned>(optimize))