/**
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),
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;
}
/**
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))