summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstar9029 <[email protected]>2024-11-19 19:15:26 +0800
committerstar9029 <[email protected]>2024-11-19 19:15:26 +0800
commit637b2c0b46bac9edad35a008f6f191e63f6acc7d (patch)
tree7849e00a3d878ee7e84afa0f400e41e720a7148f
parent7c30f1e7561a63653fb42251bc7548bc1abeb074 (diff)
remove mingw sysroot for clang
-rw-r--r--xmake/toolchains/clang/load.lua22
1 files changed, 1 insertions, 21 deletions
diff --git a/xmake/toolchains/clang/load.lua b/xmake/toolchains/clang/load.lua
index 695c3748a..f8bf4eb4f 100644
--- a/xmake/toolchains/clang/load.lua
+++ b/xmake/toolchains/clang/load.lua
@@ -85,31 +85,11 @@ function main(toolchain, suffix)
end
elseif toolchain:is_plat("mingw") then
target = target .. "-windows-gnu"
-
- local mingw
- for _, package in ipairs(toolchain:packages()) do
- local installdir = package:installdir()
- if installdir and os.isdir(installdir) then
- mingw = find_mingw(installdir, {verbose = true, cross = toolchain:cross()})
- if mingw then
- break
- end
- end
- end
- if not mingw then
- mingw = find_mingw(toolchain:config("mingw") or config.get("mingw"), {verbose = true, bindir = toolchain:bindir(), cross = toolchain:cross()})
- end
-
- if mingw and mingw.sdkdir then
- local sysroot = "--sysroot=" .. mingw.sdkdir
- toolchain:add("cxflags", sysroot)
- toolchain:add("ldflags", sysroot)
- toolchain:add("shflags", sysroot)
- end
end
if target then
toolchain:add("cxflags", "--target=" .. target)
+ toolchain:add("asflags", "--target=" .. target)
toolchain:add("ldflags", "--target=" .. target)
toolchain:add("shflags", "--target=" .. target)
end