- 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::PathList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
+ argv.push_back("-I"+i->str());
+ 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 && architecture->get_system()!="windows")
+ argv.push_back("-fPIC");
+
+ const Architecture &native_arch = builder.get_native_arch();
+ if(architecture->get_bits()!=native_arch.get_bits())
+ argv.push_back(format("-m%d", architecture->get_bits()));
+
+ const string &cpu = architecture->get_cpu();
+ if(!cpu.empty())
+ argv.push_back("-march="+cpu);