summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-10-13 23:34:53 +0800
committerruki <[email protected]>2023-10-13 23:34:53 +0800
commit6b4f659ec96a0271c12859ba17a7f56be3bcdcf3 (patch)
tree59a85680e0736247a14f0a09f0c58d901bd8baee
parent72c1a7a5c184b855bb083411d6547b5ac98009c7 (diff)
fix applexros flags
-rw-r--r--xmake/modules/detect/sdks/find_xcode.lua2
-rw-r--r--xmake/toolchains/xcode/load_applexros.lua5
2 files changed, 3 insertions, 4 deletions
diff --git a/xmake/modules/detect/sdks/find_xcode.lua b/xmake/modules/detect/sdks/find_xcode.lua
index 976df5ce1..9a6e18a38 100644
--- a/xmake/modules/detect/sdks/find_xcode.lua
+++ b/xmake/modules/detect/sdks/find_xcode.lua
@@ -63,7 +63,7 @@ function _find_xcode_sdkver(sdkdir, opt)
if arch == "i386" or arch == "x86_64" then
platsdkdir = "Contents/Developer/Platforms/XRSimulator.platform/Developer/SDKs/XRSimulator*.*.sdk"
else
- platsdkdir = "Contents/Developer/Platforms/XROS.platform/Developer/XROS*.*.sdk"
+ platsdkdir = "Contents/Developer/Platforms/XROS.platform/Developer/SDKs/XROS*.*.sdk"
end
else
platsdkdir = "Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX*.*.sdk"
diff --git a/xmake/toolchains/xcode/load_applexros.lua b/xmake/toolchains/xcode/load_applexros.lua
index 259fd18b9..d26fed61f 100644
--- a/xmake/toolchains/xcode/load_applexros.lua
+++ b/xmake/toolchains/xcode/load_applexros.lua
@@ -30,7 +30,6 @@ function main(toolchain)
local target_minver = toolchain:config("target_minver")
-- init target flags
- local appledev = toolchain:config("appledev")
if target_minver then
local target = ("%s-apple-xros%s"):format(arch, target_minver)
toolchain:add("cxflags", "-target", target)
@@ -45,8 +44,8 @@ function main(toolchain)
-- init flags for c/c++
toolchain:add("cxflags", "-isysroot", xcode_sysroot)
- toolchain:add("ldflags", "-ObjC", "-lstdc++", "-fobjc-link-runtime", target_minver_flags, "-isysroot", xcode_sysroot)
- toolchain:add("shflags", "-ObjC", "-lstdc++", "-fobjc-link-runtime", target_minver_flags, "-isysroot", xcode_sysroot)
+ toolchain:add("ldflags", "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-isysroot", xcode_sysroot)
+ toolchain:add("shflags", "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-isysroot", xcode_sysroot)
-- init flags for objc/c++
toolchain:add("mxflags", "-isysroot", xcode_sysroot)