diff options
| author | Arthur LAURENT <[email protected]> | 2025-10-24 22:43:58 +0200 |
|---|---|---|
| committer | Arthur LAURENT <[email protected]> | 2025-10-24 22:43:58 +0200 |
| commit | 44d51345d6142dc189208013439bea6f8e679613 (patch) | |
| tree | bc77857665a68286b35ecdf56b25e9bfdc09a246 | |
| parent | da18615f8926f463e464060fb6789fc58a534c46 (diff) | |
fix(llvm) fix regression
| -rw-r--r-- | xmake/toolchains/llvm/xmake.lua | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/xmake/toolchains/llvm/xmake.lua b/xmake/toolchains/llvm/xmake.lua index bac7f2705..3dce6bff4 100644 --- a/xmake/toolchains/llvm/xmake.lua +++ b/xmake/toolchains/llvm/xmake.lua @@ -91,14 +91,25 @@ toolchain("llvm") if not toolchain:config("xcode_sysroot") then local xcode_dir = get_config("xcode") local xcode_sdkver = toolchain:config("xcode_sdkver") - local xcode_sdkdir = path.join(xcode_dir, "Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX" .. xcode_sdkver .. ".sdk") + local xcode_sdkdir + if xcode_dir and xcode_sdkver then + local macsdk = path.join(xcode_dir, "Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX" .. xcode_sdkver .. ".sdk") + if os.isdir(macsdk) then + xcode_sdkdir = macsdk + end + else + -- @see https://github.com/xmake-io/xmake/issues/1179 + local macsdk = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" + if os.isdir(macsdk) then + xcode_sdkdir = macsdk + end + end if os.isdir(xcode_sdkdir) then toolchain:config_set("xcode_sysroot", xcode_sdkdir) end end -- load configurations import(".xcode.load_" .. toolchain:plat())(toolchain) - toolchain:add("mxflags", "-fobjc-arc") elseif toolchain:is_plat("cross") then local sysroot local sdkdir = toolchain:sdkdir() |