X-Git-Url: http://git.tdb.fi/?p=builder.git;a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=051722832ea66402e515733fb51cd5c6ad78aa8e;hp=a86cb59d0567b06f4e88c07a72e2ddbd4dd17d49;hb=d1a42f852e58918708b5b0cbd90219f6a95aa75b;hpb=11b4732f81396aa3d8b0fc8928b8e1981032e743

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index a86cb59..0517228 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/maputils.h>
 #include <msp/fs/dir.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
@@ -89,6 +90,12 @@ Task *GnuCompiler::run(const Target &target) const
 	BuildInfo binfo;
 	target.collect_build_info(binfo);
 
+	string tag_for_std = (tag=="OBJC" ? "CC" : tag);
+	if(binfo.standards.count(tag_for_std))
+		argv.push_back("-std="+get_item(binfo.standards, tag_for_std));
+	if(tag=="OBJC" && binfo.standards.count(tag))
+		argv.push_back("-fobjc-std="+get_item(binfo.standards, tag));
+
 	if(binfo.warning_level>=1)
 	{
 		argv.push_back("-Wall");