Have Architecture provide pattern lists for library and executable filenames

[builder.git] / source / gnucompiler.cpp

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 026ec8c8a015c08b40ef8e8b74edc37a8c12ed36..34b4e947a49e2f2637443e3d2f4aca70403ce006 100644 (file)
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -17,11 +17,6 @@ GnuCompiler::GnuCompiler(Builder &b, const string &t, const string &n):
        name(n)
 { }
 
-Target *GnuCompiler::create_source(const Component &comp, const FS::Path &path) const
-{
-       return new SourceFile(builder, comp, path);
-}
-
 Target *GnuCompiler::create_target(const list<Target *> &sources, const std::string &) const
 {
        if(sources.size()!=1)
@@ -44,12 +39,28 @@ Task *GnuCompiler::run(const Target &target) const
        const BuildInfo &binfo = comp.get_build_info();
        for(list<string>::const_iterator i=binfo.warnings.begin(); i!=binfo.warnings.end(); ++i)
                argv.push_back("-W"+*i);
-       for(list<string>::const_iterator i=binfo.cflags.begin(); i!=binfo.cflags.end(); ++i)
-               argv.push_back(*i);
        for(list<string>::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
                argv.push_back("-I"+*i);
-       for(list<string>::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
-               argv.push_back("-D"+*i);
+       for(BuildInfo::DefineMap::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
+       {
+               if(i->second.empty())
+                       argv.push_back(format("-D%s", i->first));
+               else
+                       argv.push_back(format("-D%s=%s", i->first, i->second));
+       }
+       if(binfo.debug)
+               argv.push_back("-ggdb");
+       if(binfo.optimize)
+       {
+               if(binfo.optimize<0)
+                       argv.push_back("-Os");
+               else
+                       argv.push_back(format("-O%d", binfo.optimize));
+       }
+       if(binfo.threads)
+               argv.push_back("-pthread");
+       if(comp.get_type()==Component::LIBRARY)
+               argv.push_back("-fPIC");
 
        const Architecture &arch = builder.get_current_arch();
        const Architecture &native_arch = builder.get_native_arch();