From 9e16639790c83e599b0d15e1bc27d34ea71a5118 Mon Sep 17 00:00:00 2001
From: KageKirin <kagekirin@gmail.com>
Date: Fri, 12 Jun 2020 14:33:51 +0900
Subject: [PATCH] add clang to allowed tools for ninja, xcode, gmake, cmake,
 jcdb, qbs, example

---
 src/actions/cmake/_cmake.lua     | 2 +-
 src/actions/example/_example.lua | 2 +-
 src/actions/jcdb/_jcdb.lua       | 2 +-
 src/actions/make/_make.lua       | 2 +-
 src/actions/ninja/_ninja.lua     | 2 +-
 src/actions/qbs/_qbs.lua         | 2 +-
 src/actions/xcode/xcode10.lua    | 2 +-
 src/actions/xcode/xcode8.lua     | 2 +-
 src/actions/xcode/xcode9.lua     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/actions/cmake/_cmake.lua b/src/actions/cmake/_cmake.lua
index 9620c63b..bc7f18d8 100644
--- a/src/actions/cmake/_cmake.lua
+++ b/src/actions/cmake/_cmake.lua
@@ -17,7 +17,7 @@ newaction {
 	valid_kinds     = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
 	valid_languages = { "C", "C++" },
 	valid_tools     = {
-		cc   = { "gcc" },
+		cc   = { "gcc", "clang" },
 	},
 	onsolution = function(sln)
 		premake.generate(sln, "CMakeLists.txt", premake.cmake.workspace)
diff --git a/src/actions/example/_example.lua b/src/actions/example/_example.lua
index d6a0c17b..7e26d234 100644
--- a/src/actions/example/_example.lua
+++ b/src/actions/example/_example.lua
@@ -38,7 +38,7 @@
 		-- is specified with the /cc and /dotnet command-line options. You can find
 		-- the tool interfaces at src/tools.
 		valid_tools     = {
-			cc     = { "msc", "gcc", "ow" },
+			cc     = { "msc", "gcc", "clang", "ow" },
 			dotnet = { "mono", "msnet", "pnet" },
 		},
 
diff --git a/src/actions/jcdb/_jcdb.lua b/src/actions/jcdb/_jcdb.lua
index 14a9eadb..47256732 100644
--- a/src/actions/jcdb/_jcdb.lua
+++ b/src/actions/jcdb/_jcdb.lua
@@ -11,7 +11,7 @@ newaction {
 
 	valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
 	valid_languages = { "C", "C++" },
-	valid_tools = { cc = { "gcc" } },
+	valid_tools = { cc = { "gcc", "clang" } },
 
 	onsolution = function(sln)
 		local jsonpath = path.join(sln.location, "compile_commands.json")
diff --git a/src/actions/make/_make.lua b/src/actions/make/_make.lua
index 0f1a4b60..6c9a2352 100644
--- a/src/actions/make/_make.lua
+++ b/src/actions/make/_make.lua
@@ -157,7 +157,7 @@
 		valid_languages = { "C", "C++", "C#", "Vala", "Swift" },
 
 		valid_tools     = {
-			cc     = { "gcc", "ghs" },
+			cc     = { "gcc", "clang", "ghs" },
 			dotnet = { "mono", "msnet", "pnet" },
 			valac  = { "valac" },
 			swift  = { "swift" },
diff --git a/src/actions/ninja/_ninja.lua b/src/actions/ninja/_ninja.lua
index d2fea225..0d18a501 100644
--- a/src/actions/ninja/_ninja.lua
+++ b/src/actions/ninja/_ninja.lua
@@ -19,7 +19,7 @@ newaction
 	valid_kinds     = {"ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle"},
 	valid_languages = {"C", "C++", "Swift"},
 	valid_tools     = {
-		cc    = { "gcc" },
+		cc    = { "gcc", "clang" },
 		swift = { "swift" },
 	},
 
diff --git a/src/actions/qbs/_qbs.lua b/src/actions/qbs/_qbs.lua
index 8f1ba4b5..165aea2f 100644
--- a/src/actions/qbs/_qbs.lua
+++ b/src/actions/qbs/_qbs.lua
@@ -19,7 +19,7 @@ newaction
 	valid_kinds     = {"ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle"},
 	valid_languages = {"C", "C++"},
 	valid_tools     = {
-		cc = { "gcc", "msc" },
+		cc = { "gcc", "clang", "msc" },
 	},
 
 	-- Solution and project generation logic
diff --git a/src/actions/xcode/xcode10.lua b/src/actions/xcode/xcode10.lua
index f8ae0b42..bbf3d427 100644
--- a/src/actions/xcode/xcode10.lua
+++ b/src/actions/xcode/xcode10.lua
@@ -78,7 +78,7 @@
 		valid_languages = { "C", "C++" },
 
 		valid_tools     = {
-			cc     = { "gcc" },
+			cc     = { "gcc", "clang" },
 		},
 
 		valid_platforms = {
diff --git a/src/actions/xcode/xcode8.lua b/src/actions/xcode/xcode8.lua
index 5a658c99..41ed11fc 100644
--- a/src/actions/xcode/xcode8.lua
+++ b/src/actions/xcode/xcode8.lua
@@ -324,7 +324,7 @@
 		valid_languages = { "C", "C++" },
 
 		valid_tools     = {
-			cc     = { "gcc" },
+			cc     = { "gcc", "clang" },
 		},
 
 		valid_platforms = {
diff --git a/src/actions/xcode/xcode9.lua b/src/actions/xcode/xcode9.lua
index aa70275b..b8961f8f 100644
--- a/src/actions/xcode/xcode9.lua
+++ b/src/actions/xcode/xcode9.lua
@@ -69,7 +69,7 @@
 		valid_languages = { "C", "C++" },
 
 		valid_tools     = {
-			cc     = { "gcc" },
+			cc     = { "gcc", "clang" },
 		},
 
 		valid_platforms = {