Browse Source

Some Premake robustness fixes for Clang toolchain.

pull/1521/head
Joao Matos 5 years ago committed by João Matos
parent
commit
1407f35a11
  1. 10
      build/Helpers.lua

10
build/Helpers.lua

@ -151,7 +151,10 @@ function SetupNativeProject()
filter { "toolset:clang", "system:not macosx" } filter { "toolset:clang", "system:not macosx" }
linkoptions { "-fuse-ld=/usr/bin/ld.lld" } linkoptions { "-fuse-ld=/usr/bin/ld.lld" }
filter { "system:macosx", "language:C++" } filter { "toolset:clang" }
buildoptions { "-fstandalone-debug" }
filter { "toolset:clang", "language:C++", "system:macosx" }
buildoptions { gcc_buildflags, "-stdlib=libc++" } buildoptions { gcc_buildflags, "-stdlib=libc++" }
links { "c++" } links { "c++" }
@ -238,8 +241,9 @@ function StaticLinksOpt(libnames)
end end
function UseClang() function UseClang()
local compiler = os.getenv("CXX") or "" local cc = _OPTIONS.cc or ""
return string.match(compiler, "clang") local env = os.getenv("CXX") or ""
return string.match(cc, "clang") or string.match(env, "clang")
end end
function GccVersion() function GccVersion()

Loading…
Cancel
Save