2
0
Эх сурвалжийг харах

Fixed default toolchain for iOS/tvOS.

Branimir Karadžić 10 жил өмнө
parent
commit
1645735387

+ 8 - 8
scripts/toolchain.lua

@@ -170,26 +170,26 @@ function toolchain(_buildDir, _libDir)
 			location (path.join(_buildDir, "projects", _ACTION .. "-freebsd"))
 			location (path.join(_buildDir, "projects", _ACTION .. "-freebsd"))
 
 
 		elseif "ios-arm" == _OPTIONS["gcc"] then
 		elseif "ios-arm" == _OPTIONS["gcc"] then
-			premake.gcc.cc  = "clang"
-			premake.gcc.cxx = "clang++"
+			premake.gcc.cc  = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
+			premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
 			premake.gcc.ar  = "ar"
 			premake.gcc.ar  = "ar"
 			location (path.join(_buildDir, "projects", _ACTION .. "-ios-arm"))
 			location (path.join(_buildDir, "projects", _ACTION .. "-ios-arm"))
 
 
 		elseif "ios-simulator" == _OPTIONS["gcc"] then
 		elseif "ios-simulator" == _OPTIONS["gcc"] then
-			premake.gcc.cc  = "clang"
-			premake.gcc.cxx = "clang++"
+			premake.gcc.cc  = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
+			premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
 			premake.gcc.ar  = "ar"
 			premake.gcc.ar  = "ar"
 			location (path.join(_buildDir, "projects", _ACTION .. "-ios-simulator"))
 			location (path.join(_buildDir, "projects", _ACTION .. "-ios-simulator"))
 
 
 		elseif "tvos-arm64" == _OPTIONS["gcc"] then
 		elseif "tvos-arm64" == _OPTIONS["gcc"] then
-			premake.gcc.cc  = "clang"
-			premake.gcc.cxx = "clang++"
+			premake.gcc.cc  = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
+			premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
 			premake.gcc.ar  = "ar"
 			premake.gcc.ar  = "ar"
 			location (path.join(_buildDir, "projects", _ACTION .. "-tvos-arm64"))
 			location (path.join(_buildDir, "projects", _ACTION .. "-tvos-arm64"))
 
 
 		elseif "tvos-simulator" == _OPTIONS["gcc"] then
 		elseif "tvos-simulator" == _OPTIONS["gcc"] then
-			premake.gcc.cc  = "clang"
-			premake.gcc.cxx = "clang++"
+			premake.gcc.cc  = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
+			premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
 			premake.gcc.ar  = "ar"
 			premake.gcc.ar  = "ar"
 			location (path.join(_buildDir, "projects", _ACTION .. "-tvos-simulator"))
 			location (path.join(_buildDir, "projects", _ACTION .. "-tvos-simulator"))