diff options
Diffstat (limited to 'xmake/toolchains')
| -rw-r--r-- | xmake/toolchains/clang/load.lua | 3 | ||||
| -rw-r--r-- | xmake/toolchains/llvm/xmake.lua | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xmake/toolchains/clang/load.lua b/xmake/toolchains/clang/load.lua index 74b04e867..aef891dfd 100644 --- a/xmake/toolchains/clang/load.lua +++ b/xmake/toolchains/clang/load.lua @@ -21,6 +21,7 @@ import("detect.sdks.find_vstudio") import("detect.sdks.find_mingw") import("core.project.config") +import("private.utils.toolchain", {alias = "toolchain_utils"}) -- add the given vs environment function _add_vsenv(toolchain, name, curenvs) @@ -91,6 +92,8 @@ function main(toolchain, suffix) target = target .. "-linux-gnu" end + toolchain_utils.set_llvm_runenvs(toolchain) + if target then toolchain:add("cxflags", "--target=" .. target) toolchain:add("asflags", "--target=" .. target) diff --git a/xmake/toolchains/llvm/xmake.lua b/xmake/toolchains/llvm/xmake.lua index 61288f1bd..7de57be22 100644 --- a/xmake/toolchains/llvm/xmake.lua +++ b/xmake/toolchains/llvm/xmake.lua @@ -57,10 +57,7 @@ toolchain("llvm") toolchain:add("runtimes", "MT", "MTd", "MD", "MDd") end - local dirs = toolchain_utils.get_llvm_dirs(toolchain) - if dirs and dirs.rt then - toolchain:add("runenvs", dirs.rt) - end + toolchain_utils.set_llvm_runenvs(toolchain) -- add target flags local target |