Change the default value of the cpu option to "none" since there's no actual autodete...

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 6f3db4d8e07e392451dbfe527397cbf3786394f6..54de8f6a7cf076c178c95440d70ba4cb614d1c67 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -33,12 +33,12 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s):
        components.push_back(Component(*this, Component::TARBALL, "@src"));
 }
 
-Msp::FS::Path SourcePackage::get_temp_dir() const
+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::FS::Path SourcePackage::get_out_dir() const
+FS::Path SourcePackage::get_out_dir() const
 {
        const Architecture &arch=builder.get_current_arch();
        if(arch.is_native())
@@ -135,7 +135,7 @@ void SourcePackage::init_config()
        config.add_option("optimize",   "0",       "Apply compiler optimizations");
        config.add_option("strip",      "0",       "Strip symbols from programs");
        config.add_option("debug",      "0",       "Produce debugging symbols");
-       config.add_option("cpu",        "auto",    "CPU type to optimize for");
+       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)
@@ -181,7 +181,7 @@ void SourcePackage::create_build_info()
                build_info.cflags.push_back("-O"+optimize);
                build_info.ldflags.push_back("-O"+optimize);
                string cpu=config.get_option("cpu").value;
-               if(cpu!="auto")
+               if(cpu!="none")
                        build_info.cflags.push_back("-march="+cpu);
        }