diff options
| author | ruki <[email protected]> | 2023-09-28 19:27:06 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-09-28 19:27:06 +0800 |
| commit | 58eee2611889b008c079cac585945eec8698198a (patch) | |
| tree | 2a436a6a94283af9341981996c1d4084274cb938 | |
| parent | 277c1bdfee28694e6658824baa1de2548cb6c750 (diff) | |
| parent | bbe4ca07af92c64be3a355ae1808802bbebacf87 (diff) | |
Merge pull request #4249 from Arthapz/fix-llvm-isysroot
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") |