Merge pull request #1898 from xmake-io/ifort

improve ifort

1 files changed, 8 insertions, 1 deletions

diff --git a/xmake/toolchains/ifort/load.lua b/xmake/toolchains/ifort/load.lua
index 804f3a914..2cb212a57 100644
--- a/xmake/toolchains/ifort/load.lua
+++ b/xmake/toolchains/ifort/load.lua
@@ -26,7 +26,7 @@ import("core.project.config")
 function _add_ifortenv(toolchain, name)
 
     -- get ifortvarsall
-    local ifortvarsall = config.get("__ifortvarsall")
+    local ifortvarsall = toolchain:config("varsall")
     if not ifortvarsall then
         return
     end
@@ -85,6 +85,13 @@ function _load_intel_on_linux(toolchain)
         toolchain:add("fcldflags", march)
         toolchain:add("fcshflags", march)
     end
+
+    -- get ifort environments
+    local ifortenv = toolchain:config("ifortenv")
+    if ifortenv then
+        local ldname = is_host("macosx") and "DYLD_LIBRARY_PATH" or "LD_LIBRARY_PATH"
+        toolchain:add("runenvs", ldname, ifortenv.libdir)
+    end
 end
 
 -- main entry