From f02a99785c4ad5c277b93fd399da65c3013f65b0 Mon Sep 17 00:00:00 2001
From: Pentarctagon <pentarctagon@tutamail.com>
Date: Sun, 3 May 2020 15:34:32 -0500
Subject: [PATCH] Clang 10 warning fix: -Wstring-plus-int at
 src/lua/lundump.cpp:237.

---
 src/CMakeLists.txt | 6 ++++++
 src/SConscript     | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8f7505c2055..5b07eeb03c8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -196,6 +196,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 		APPEND_STRING PROPERTY COMPILE_FLAGS
 			" -Wno-parentheses-equality"
 	)
+# silence a Clang specific warning when compiling the lua code
+	set_property(SOURCE
+		SOURCE ${lua_STAT_SRC}
+		APPEND_STRING PROPERTY COMPILE_FLAGS
+			" -Wno-string-plus-int"
+	)
 endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
 # a 'lib' is automatically set in front when creating the library (as in the filename)
diff --git a/src/SConscript b/src/SConscript
index 3101219e53d..30096718bd7 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -109,8 +109,9 @@ env_lua = env.Clone(
 
 env_lua.AppendUnique(CCFLAGS = Split("-Wno-old-style-cast -Wno-useless-cast"))
 # Silence some Clang-specific warnings due to extra parentheses in if statements when comparing.
+# also silence a warning for the lua code
 if "clang" in env["CXX"]:
-    env_lua.AppendUnique(CCFLAGS = Split("-Wno-parentheses-equality"))
+    env_lua.AppendUnique(CCFLAGS = Split("-Wno-parentheses-equality -Wno-string-plus-int"))
 
 if env_lua["enable_lto"] == True:
     env_lua["AR"] = 'gcc-ar'