improve xcode toolchain

1 files changed, 13 insertions, 20 deletions

diff --git a/xmake/toolchains/xcode/load_macosx.lua b/xmake/toolchains/xcode/load_macosx.lua
index f87a00c4f..6c3ab454a 100644
--- a/xmake/toolchains/xcode/load_macosx.lua
+++ b/xmake/toolchains/xcode/load_macosx.lua
@@ -27,14 +27,7 @@ function main(toolchain)
     -- init flags for architecture
     local arch          = toolchain:arch()
     local target_minver = toolchain:config("target_minver")
-
-    -- init flags for the xcode sdk directory
-    local xcode_dir     = config.get("xcode")
-    local xcode_sdkver  = toolchain:config("xcode_sdkver")
-    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"
-    end
+    local xcode_sysroot = toolchain:config("xcode_sysroot")
 
     -- init flags for c/c++
     toolchain:add("cxflags", "-arch " .. arch)
@@ -46,10 +39,10 @@ function main(toolchain)
         toolchain:add("ldflags", "-mmacosx-version-min=" .. target_minver)
         toolchain:add("shflags", "-mmacosx-version-min=" .. target_minver)
     end
-    if xcode_sdkdir then
-        toolchain:add("cxflags", "-isysroot " .. xcode_sdkdir)
-        toolchain:add("ldflags", "-isysroot " .. xcode_sdkdir)
-        toolchain:add("shflags", "-isysroot " .. xcode_sdkdir)
+    if xcode_sysroot then
+        toolchain:add("cxflags", "-isysroot " .. xcode_sysroot)
+        toolchain:add("ldflags", "-isysroot " .. xcode_sysroot)
+        toolchain:add("shflags", "-isysroot " .. xcode_sysroot)
     end
     toolchain:add("ldflags", "-stdlib=libc++")
     toolchain:add("shflags", "-stdlib=libc++")
@@ -57,20 +50,20 @@ function main(toolchain)
 
     -- init flags for objc/c++ (with ldflags and shflags)
     toolchain:add("mxflags", "-arch " .. arch)
-    if xcode_sdkdir then
-        toolchain:add("mxflags", "-isysroot " .. xcode_sdkdir)
+    if xcode_sysroot then
+        toolchain:add("mxflags", "-isysroot " .. xcode_sysroot)
     end
 
     -- init flags for asm
     toolchain:add("asflags", "-arch " .. arch)
-    if xcode_sdkdir then
-        toolchain:add("asflags", "-isysroot " .. xcode_sdkdir)
+    if xcode_sysroot then
+        toolchain:add("asflags", "-isysroot " .. xcode_sysroot)
     end
 
     -- init flags for swift
-    if target_minver and xcode_sdkdir then
-        toolchain:add("scflags", format("-target %s-apple-macosx%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
-        toolchain:add("scshflags", format("-target %s-apple-macosx%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
-        toolchain:add("scldflags", format("-target %s-apple-macosx%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
+    if target_minver and xcode_sysroot then
+        toolchain:add("scflags", format("-target %s-apple-macosx%s", arch, target_minver) , "-sdk " .. xcode_sysroot)
+        toolchain:add("scshflags", format("-target %s-apple-macosx%s", arch, target_minver) , "-sdk " .. xcode_sysroot)
+        toolchain:add("scldflags", format("-target %s-apple-macosx%s", arch, target_minver) , "-sdk " .. xcode_sysroot)
     end
 end