diff options
Diffstat (limited to 'xmake/toolchains/icc/load.lua')
| -rw-r--r-- | xmake/toolchains/icc/load.lua | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/xmake/toolchains/icc/load.lua b/xmake/toolchains/icc/load.lua index 5784fc5c8..e1ceba260 100644 --- a/xmake/toolchains/icc/load.lua +++ b/xmake/toolchains/icc/load.lua @@ -26,7 +26,7 @@ import("core.project.config") function _add_iclenv(toolchain, name) -- get iclvarsall - local iclvarsall = config.get("__iclvarsall") + local iclvarsall = toolchain:config("varsall") if not iclvarsall then return end @@ -100,6 +100,13 @@ function _load_intel_on_linux(toolchain) toolchain:add("ldflags", march) toolchain:add("shflags", march) end + + -- get icc environments + local iccenv = toolchain:config("iccenv") + if iccenv then + local ldname = is_host("macosx") and "DYLD_LIBRARY_PATH" or "LD_LIBRARY_PATH" + toolchain:add("runenvs", ldname, iccenv.libdir) + end end -- main entry |