Merge pull request #816 from Blizzard/fix-cpp17-flags

Fixed C++17 flag to work with current versions of Clang.
premake · Jun 19, 2017 · 22cebb4 · 22cebb4
2 parents 4db1a6c + a6cf052
commit 22cebb4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/tools/gcc.lua b/src/tools/gcc.lua
@@ -136,11 +136,11 @@
 			["C++98"] = "-std=c++98",
 			["C++11"] = "-std=c++11",
 			["C++14"] = "-std=c++14",
-			["C++17"] = "-std=c++17",
+			["C++17"] = "-std=c++1z",
 			["gnu++98"] = "-std=gnu++98",
 			["gnu++11"] = "-std=gnu++11",
 			["gnu++14"] = "-std=gnu++14",
-			["gnu++17"] = "-std=gnu++17",
+			["gnu++17"] = "-std=gnu++1z",
 		},
 		rtti = {
 			Off = "-fno-rtti"

diff --git a/tests/tools/test_gcc.lua b/tests/tools/test_gcc.lua
@@ -655,7 +655,7 @@
 	function suite.cxxflags_onCpp17()
 		cppdialect "C++17"
 		prepare()
-		test.contains({ "-std=c++17" }, gcc.getcxxflags(cfg))
+		test.contains({ "-std=c++1z" }, gcc.getcxxflags(cfg))
 		test.contains({ }, gcc.getcflags(cfg))
 	end
 
@@ -683,6 +683,6 @@
 	function suite.cxxflags_onCppGnu17()
 		cppdialect "gnu++17"
 		prepare()
-		test.contains({ "-std=gnu++17" }, gcc.getcxxflags(cfg))
+		test.contains({ "-std=gnu++1z" }, gcc.getcxxflags(cfg))
 		test.contains({ }, gcc.getcflags(cfg))
 	end