AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Fixed C++17 flag to work with current versions of Clang.
This commit is contained in:
Tom van Dijck 2017-06-19 13:09:59 -07:00 committed by GitHub
commit 22cebb4dfa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/gcc.lua
View File

@ -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"

4
tests/tools/test_gcc.lua
View File

@ -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