diff options
| author | ruki <[email protected]> | 2021-12-08 23:08:41 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-12-08 23:08:41 +0800 |
| commit | 42c73afaf38ab2645944c8bccd4e24aedba62d7e (patch) | |
| tree | 9ea696f7fc3f7735b1c504d6fb25e212506d24eb /xmake/toolchains | |
| parent | dedcd548ec31ad936128b272c705f8f30fb01eb2 (diff) | |
improve ifort toolchain
Diffstat (limited to 'xmake/toolchains')
| -rw-r--r-- | xmake/toolchains/ifort/check.lua | 5 | ||||
| -rw-r--r-- | xmake/toolchains/ifort/load.lua | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xmake/toolchains/ifort/check.lua b/xmake/toolchains/ifort/check.lua index cb37666b7..285f5c86c 100644 --- a/xmake/toolchains/ifort/check.lua +++ b/xmake/toolchains/ifort/check.lua @@ -43,7 +43,7 @@ function _check_intel_on_windows(toolchain) if tool then cprint("checking for Intel Fortran Compiler (%s) ... ${color.success}${text.success}", toolchain:arch()) toolchain:config_set("varsall", ifortvarsall) - toolchain:config_save() + toolchain:configs_save() return true end end @@ -63,7 +63,8 @@ function _check_intel_on_linux(toolchain) if tool then cprint("checking for Intel Fortran Compiler (%s) ... ${color.success}${text.success}", toolchain:arch()) toolchain:config_set("ifortenv", ifortenv) - toolchain:config_save() + toolchain:config_set("bindir", ifortenv.bindir) + toolchain:configs_save() return true end return true diff --git a/xmake/toolchains/ifort/load.lua b/xmake/toolchains/ifort/load.lua index 2cb212a57..1d8eb870f 100644 --- a/xmake/toolchains/ifort/load.lua +++ b/xmake/toolchains/ifort/load.lua @@ -87,7 +87,6 @@ function _load_intel_on_linux(toolchain) 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) |