Merge pull request #623 from mikisch81/gcc-add-c90-c99-flags

Added C90 and C99 flags to gcc

modules/codelite/codelite_project.lua

@@ -196,7 +196,7 @@
 		end
 
 		local toolset = m.getcompiler(cfg)
-		local cxxflags = table.concat(table.join(toolset.getcflags(cfg), toolset.getcxxflags(cfg), cfg.buildoptions), ";")
+		local cxxflags = table.concat(table.join(toolset.getcxxflags(cfg), cfg.buildoptions), ";")
 		local cflags   = table.concat(table.join(toolset.getcflags(cfg), cfg.buildoptions), ";")
 		local asmflags = ""
 		local pch      = ""

src/_premake_init.lua

@@ -503,6 +503,8 @@
 			"WPF",
 			"C++11",
 			"C++14",
+			"C90",
+			"C99",
 		},
 		aliases = {
 			FatalWarnings = { "FatalWarnings", "FatalCompileWarnings", "FatalLinkWarnings" },

src/actions/make/make_cpp.lua

@@ -335,7 +335,7 @@
 
 
 	function make.cxxFlags(cfg, toolset)
-		_p('  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS)%s', make.list(toolset.getcxxflags(cfg)))
+		_p('  ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS)%s', make.list(table.join(toolset.getcxxflags(cfg), cfg.buildoptions)))
 	end
 
 

src/tools/clang.lua

@@ -41,11 +41,11 @@
 --    An array of C compiler flags.
 --
 
-	clang.cflags = {
+	clang.shared = {
-		architecture = gcc.cflags.architecture,
+		architecture = gcc.shared.architecture,
-		flags = gcc.cflags.flags,
+		flags = gcc.shared.flags,
-		floatingpoint = gcc.cflags.floatingpoint,
+		floatingpoint = gcc.shared.floatingpoint,
-		strictaliasing = gcc.cflags.strictaliasing,
+		strictaliasing = gcc.shared.strictaliasing,
 		optimize = {
 			Off = "-O0",
 			On = "-O2",
@@ -54,18 +54,21 @@
 			Size = "-Os",
 			Speed = "-O3",
 		},
-		pic = gcc.cflags.pic,
+		pic = gcc.shared.pic,
-		vectorextensions = gcc.cflags.vectorextensions,
+		vectorextensions = gcc.shared.vectorextensions,
-		warnings = gcc.cflags.warnings,
+		warnings = gcc.shared.warnings,
-		symbols = gcc.cflags.symbols
+		symbols = gcc.shared.symbols
 	}
 
 	function clang.getcflags(cfg)
+		local shared_flags = config.mapFlags(cfg, clang.shared)
 
-		local flags = config.mapFlags(cfg, clang.cflags)
+		-- Just pass through to GCC for now
+		local cflags = config.mapFlags(cfg, gcc.cflags)
+
+		local flags = table.join(shared_flags, cflags)
 		flags = table.join(flags, clang.getwarnings(cfg))
 		return flags
-
 	end
 
 	function clang.getwarnings(cfg)
@@ -88,11 +91,14 @@
 --
 
 	function clang.getcxxflags(cfg)
+		local shared_flags = config.mapFlags(cfg, clang.shared)
 
 		-- Just pass through to GCC for now
-		local flags = gcc.getcxxflags(cfg)
+		local cxxflags = config.mapFlags(cfg, gcc.cxxflags)
-		return flags
 
+		local flags = table.join(shared_flags, cxxflags)
+		flags = table.join(flags, clang.getwarnings(cfg))
+		return flags
 	end
 
 

src/tools/gcc.lua

@@ -34,8 +34,7 @@
 --
 -- Returns list of C compiler flags for a configuration.
 --
-
+	gcc.shared = {
-	gcc.cflags = {
 		architecture = {
 			x86 = "-m32",
 			x86_64 = "-m64",
@@ -86,8 +85,17 @@
 		}
 	}
 
+	gcc.cflags = {
+		flags = {
+			["C90"] = "-std=gnu90",
+			["C99"] = "-std=gnu99",
+		},
+	}
+
 	function gcc.getcflags(cfg)
-		local flags = config.mapFlags(cfg, gcc.cflags)
+		local shared_flags = config.mapFlags(cfg, gcc.shared)
+		local cflags = config.mapFlags(cfg, gcc.cflags)
+		local flags = table.join(shared_flags, cflags)
 		flags = table.join(flags, gcc.getwarnings(cfg))
 		return flags
 	end
@@ -126,7 +134,10 @@
 	}
 
 	function gcc.getcxxflags(cfg)
-		local flags = config.mapFlags(cfg, gcc.cxxflags)
+		local shared_flags = config.mapFlags(cfg, gcc.shared)
+		local cxxflags = config.mapFlags(cfg, gcc.cxxflags)
+		local flags = table.join(shared_flags, cxxflags)
+		flags = table.join(flags, gcc.getwarnings(cfg))
 		return flags
 	end
 
@@ -192,7 +203,7 @@
 	end
 
 --
--- Return a list of decorated rpaths 
+-- Return a list of decorated rpaths
 --
 
 	function gcc.getrunpathdirs(cfg, dirs)
@@ -386,7 +397,7 @@
 					return ptrn == string.sub(s, -string.len(ptrn))
 				end
 				local name = path.getname(link)
-				-- Check whether link mode decorator is present 
+				-- Check whether link mode decorator is present
 				if endswith(name, ":static") then
 					name = string.sub(name, 0, -8)
 					table.insert(static_syslibs, "-l" .. name)