summaryrefslogtreecommitdiff
path: root/xmake/toolchains
diff options
context:
space:
mode:
authorruki <[email protected]>2024-07-09 22:53:03 +0800
committerruki <[email protected]>2024-07-09 22:53:03 +0800
commitc74b2ffe7cac1192bc6d567f5c2b9f086a78c6aa (patch)
treec056093bc01528d9952b9672513f079f5ad423a9 /xmake/toolchains
parent3f3fc063d40ca7114e21b511bb033d048a7af963 (diff)
fix ifx env
Diffstat (limited to 'xmake/toolchains')
-rw-r--r--xmake/toolchains/ifx/load.lua27
1 files changed, 8 insertions, 19 deletions
diff --git a/xmake/toolchains/ifx/load.lua b/xmake/toolchains/ifx/load.lua
index 90fc7910c..217b574fd 100644
--- a/xmake/toolchains/ifx/load.lua
+++ b/xmake/toolchains/ifx/load.lua
@@ -79,27 +79,16 @@ end
function _load_intel_on_windows(toolchain)
-- set toolset
- if toolchain:is_plat("windows") then
- toolchain:set("toolset", "cc", "ifx.exe")
- toolchain:set("toolset", "cxx", "ifx.exe")
- toolchain:set("toolset", "mrc", "rc.exe")
- if toolchain:is_arch("x64") then
- toolchain:set("toolset", "as", "ml64.exe")
- else
- toolchain:set("toolset", "as", "ml.exe")
- end
- toolchain:set("toolset", "ld", "link.exe")
- toolchain:set("toolset", "sh", "link.exe")
- toolchain:set("toolset", "ar", "link.exe")
+ toolchain:set("toolset", "fc", "ifx.exe")
+ toolchain:set("toolset", "mrc", "rc.exe")
+ if toolchain:is_arch("x64") then
+ toolchain:set("toolset", "as", "ml64.exe")
else
- toolchain:set("toolset", "cc", "ifx")
- toolchain:set("toolset", "cxx", "icpx", "ifx")
- toolchain:set("toolset", "ld", "icpx", "ifx")
- toolchain:set("toolset", "sh", "icpx", "ifx")
- toolchain:set("toolset", "ar", "ar")
- toolchain:set("toolset", "strip", "strip")
- toolchain:set("toolset", "as", "ifx")
+ toolchain:set("toolset", "as", "ml.exe")
end
+ toolchain:set("toolset", "fcld", "ifx.exe")
+ toolchain:set("toolset", "fcsh", "ifx.exe")
+ toolchain:set("toolset", "ar", "link.exe")
-- add vs/ifx environments
local expect_vars = {"PATH", "LIB", "INCLUDE", "LIBPATH"}