From d005322e2ba4131032eee6293ffdb79b923c876d Mon Sep 17 00:00:00 2001 From: Trammell Hudson Date: Sat, 28 Nov 2015 09:12:34 -0500 Subject: [PATCH] Merge clang++ version 30000 and 30400 sections to enable -Wno-constant-logical-operand --- scripts/genie.lua | 4 ---- scripts/toolchain.lua | 1 - 2 files changed, 5 deletions(-) diff --git a/scripts/genie.lua b/scripts/genie.lua index 6ac6933c45f..f43f06b94b3 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1001,10 +1001,6 @@ end if (version >= 30000) then buildoptions { "-Wno-unused-value", - } - end - if (version >= 30400) then - buildoptions { "-Wno-inline-new-delete", "-Wno-constant-logical-operand", } diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index d200ab0f2d5..e6e2e0e773b 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -858,7 +858,6 @@ function toolchain(_buildDir, _subDir) objdir (_buildDir .. "osx_clang" .. "/obj") buildoptions { "-m64", - "-Wno-constant-logical-operand", } configuration { "osx*", "x64", "Release" }