Redesign how tools are run

[builder.git] / source / gnucompiler.cpp

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index b8b25152e70acfce73e0c9f9e313daf8460f3979..0ec9222a2d28587f8127f01cbaa1e01008496459 100644 (file)
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -51,6 +51,7 @@ GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t):
                throw invalid_argument("GnuCompiler::GnuCompiler");
 
        set_command((tag=="CXX" ? "g++" : "gcc"), true);
+       set_run(_run);
 }
 
 Target *GnuCompiler::create_source(const Component &comp, const FS::Path &path) const
@@ -198,22 +199,24 @@ void GnuCompiler::prepare_version(const string &arg)
        { }
 }
 
-Task *GnuCompiler::run(const Target &target) const
+Task *GnuCompiler::_run(const ObjectFile &object)
 {
-       const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
+       const GnuCompiler &tool = dynamic_cast<const GnuCompiler &>(*object.get_tool());
+       const Architecture &arch = *tool.get_architecture();
 
        ExternalTask::Arguments argv;
-       argv.push_back(executable->get_path().str());
+       argv.push_back(tool.get_executable()->get_path().str());
        argv.push_back("-c");
 
        BuildInfo binfo;
-       target.collect_build_info(binfo);
+       object.collect_build_info(binfo);
 
-       string tag_for_std = (tag=="OBJC" ? "CC" : tag);
+       const std::string &tool_tag = tool.get_tag();
+       string tag_for_std = (tool_tag=="OBJC" ? "CC" : tool_tag);
        if(binfo.standards.count(tag_for_std))
                argv.push_back("-std="+get_item(binfo.standards, tag_for_std).str());
-       if(tag=="OBJC" && binfo.standards.count(tag))
-               argv.push_back("-fobjc-std="+get_item(binfo.standards, tag).str());
+       if(tool_tag=="OBJC" && binfo.standards.count(tool_tag))
+               argv.push_back("-fobjc-std="+get_item(binfo.standards, tool_tag).str());
 
        if(binfo.warning_level>=1)
        {
@@ -222,7 +225,7 @@ Task *GnuCompiler::run(const Target &target) const
                {
                        argv.push_back("-Wextra");
                        argv.push_back("-Wundef");
-                       if(version>=0x80000)
+                       if(tool.version>=0x80000)
                                argv.push_back("-Wno-cast-function-type");
                }
                if(binfo.warning_level>=3)
@@ -230,7 +233,7 @@ Task *GnuCompiler::run(const Target &target) const
                        argv.push_back("-pedantic");
                        argv.push_back("-Wno-long-long");
                        argv.push_back("-Wshadow");
-                       if(tag=="CC")
+                       if(tool_tag=="CC")
                        {
                                argv.push_back("-Wc++-compat");
                                argv.push_back("-Wstrict-prototypes");
@@ -282,15 +285,15 @@ Task *GnuCompiler::run(const Target &target) const
                if(binfo.debug)
                        argv.push_back("-fno-omit-frame-pointer");
        }
-       if(binfo.threads && architecture->get_system()!="windows" && architecture->get_system()!="darwin")
+       if(binfo.threads && arch.get_system()!="windows" && arch.get_system()!="darwin")
                argv.push_back("-pthread");
-       if(object.is_used_in_shared_library() && architecture->get_system()!="windows")
+       if(object.is_used_in_shared_library() && arch.get_system()!="windows")
                argv.push_back("-fPIC");
 
-       if((architecture->get_type()=="x86" || architecture->get_type()=="ppc") && !architecture->is_native())
-               argv.push_back(format("-m%d", architecture->get_bits()));
+       if((arch.get_type()=="x86" || arch.get_type()=="ppc") && !arch.is_native())
+               argv.push_back(format("-m%d", arch.get_bits()));
 
-       string cpu = architecture->get_cpu();
+       string cpu = arch.get_cpu();
        if(!cpu.empty())
        {
                for(unsigned i=0; cpus[i]; i+=2)
@@ -302,25 +305,25 @@ Task *GnuCompiler::run(const Target &target) const
                argv.push_back("-march="+cpu);
        }
 
-       if(!architecture->get_fpu().empty())
+       if(!arch.get_fpu().empty())
        {
-               if(architecture->get_type()=="x86")
+               if(arch.get_type()=="x86")
                {
-                       if(architecture->get_fpu()=="387")
+                       if(arch.get_fpu()=="387")
                                argv.push_back("-mfpmath=387");
-                       else if(!architecture->get_fpu().compare(0, 3, "sse"))
+                       else if(!arch.get_fpu().compare(0, 3, "sse"))
                                argv.push_back("-mfpmath=sse");
 
-                       if(architecture->get_fpu()=="sse")
+                       if(arch.get_fpu()=="sse")
                                argv.push_back("-msse2");
-                       else if(architecture->get_fpu()=="sse3")
+                       else if(arch.get_fpu()=="sse3")
                                argv.push_back("-msse3");
-                       else if(architecture->get_fpu()=="sse4.1")
+                       else if(arch.get_fpu()=="sse4.1")
                                argv.push_back("-msse4.1");
                }
-               else if(architecture->get_type()=="arm")
+               else if(arch.get_type()=="arm")
                {
-                       argv.push_back("-mfpu="+architecture->get_fpu());
+                       argv.push_back("-mfpu="+arch.get_fpu());
                        argv.push_back("-mfloat-abi=softfp");
                }
        }