diff options
| author | Arthur LAURENT <[email protected]> | 2023-09-28 00:07:50 +0200 |
|---|---|---|
| committer | Arthur LAURENT <[email protected]> | 2023-09-28 12:32:11 +0200 |
| commit | bbe4ca07af92c64be3a355ae1808802bbebacf87 (patch) | |
| tree | aa6e2857cb5432e8f356984b33d3015c0c9059b0 | |
| parent | c835fd822cf03df508bdf9d766b20a8c70a6340e (diff) | |
fix cmake compilation when using llvm toolchain
| -rw-r--r-- | xmake/toolchains/llvm/xmake.lua | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/xmake/toolchains/llvm/xmake.lua b/xmake/toolchains/llvm/xmake.lua index 6942717ec..04b7e1919 100644 --- a/xmake/toolchains/llvm/xmake.lua +++ b/xmake/toolchains/llvm/xmake.lua @@ -31,6 +31,8 @@ toolchain("llvm") -- set toolset set_toolset("cc", "clang") set_toolset("cxx", "clang", "clang++") + set_toolset("mxx", "clang", "clang++") + set_toolset("mm", "clang", "clang++") set_toolset("cpp", "clang -E") set_toolset("as", "clang") set_toolset("ld", "clang++", "clang") @@ -77,18 +79,18 @@ toolchain("llvm") local xcode_sdkdir = nil if xcode_dir and xcode_sdkver then xcode_sdkdir = xcode_dir .. "/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX" .. xcode_sdkver .. ".sdk" - toolchain:add("cxflags", "-isysroot " .. xcode_sdkdir) - toolchain:add("mxflags", "-isysroot " .. xcode_sdkdir) - toolchain:add("ldflags", "-isysroot " .. xcode_sdkdir) - toolchain:add("shflags", "-isysroot " .. xcode_sdkdir) + toolchain:add("cxflags", {"-isysroot", xcode_sdkdir}) + toolchain:add("mxflags", {"-isysroot", xcode_sdkdir}) + toolchain:add("ldflags", {"-isysroot", xcode_sdkdir}) + toolchain:add("shflags", {"-isysroot", xcode_sdkdir}) else -- @see https://github.com/xmake-io/xmake/issues/1179 local macsdk = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" if os.exists(macsdk) then - toolchain:add("cxflags", "-isysroot " .. macsdk) - toolchain:add("mxflags", "-isysroot " .. macsdk) - toolchain:add("ldflags", "-isysroot " .. macsdk) - toolchain:add("shflags", "-isysroot " .. macsdk) + toolchain:add("cxflags", {"-isysroot", macsdk}) + toolchain:add("mxflags", {"-isysroot", macsdk}) + toolchain:add("ldflags", {"-isysroot", macsdk}) + toolchain:add("shflags", {"-isysroot", macsdk}) end end toolchain:add("mxflags", "-fobjc-arc") |