/* $Id$
This file is part of builder
-Copyright © 2007-2009 Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2010 Mikko Rasa, Mikkosoft Productions
Distributed under the LGPL
*/
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;
+ string subdir = format("%s.%s", builder.get_current_arch().get_name(), config.get_option("profile").value);
+ return source/config.get_option("tempdir").value/subdir;
}
FS::Path SourcePackage::get_out_dir() const
config.add_option("profile", "default", "Configuration profile");
config.add_option("tempdir", "temp", "Directory for storing temporary files");
config.add_option("outdir", ".", "Directory to put build results in");
- config.add_option("optimize", "0", "Apply compiler optimizations");
+ config.add_option("optimize", "0", "Compiler optimization level");
config.add_option("strip", "no", "Strip symbols from programs");
config.add_option("debug", "no", "Produce debugging symbols");
- config.add_option("cpu", "none", "CPU type to optimize for");
config.add_option("staticlibs", "local", "Use static libraries");
for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
void SourcePackage::create_build_info()
{
+ build_info.add(builder.get_current_arch().get_build_info());
+
for(PackageList::iterator i=base_reqs.begin(); i!=base_reqs.end(); ++i)
{
const BuildInfo &ebi = (*i)->get_exported_binfo();
{
build_info.cflags.push_back("-O"+optimize);
build_info.ldflags.push_back("-O"+optimize);
- string cpu = config.get_option("cpu").value;
- if(cpu!="none")
- build_info.cflags.push_back("-march="+cpu);
}
if(lexical_cast<bool>(config.get_option("debug").value))