diff options
| author | ruki <[email protected]> | 2020-10-07 23:10:04 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-10-07 23:10:04 +0800 |
| commit | 089b3b754c5b1bfe580a3b3e3b19d506490f9749 (patch) | |
| tree | 2cadca79eff6c7b5eae62dbe7af9505bf1da7d6f | |
| parent | fb24f3450c6578054d6a4817a23341c17139fda2 (diff) | |
improve ifort toolchain
| -rw-r--r-- | xmake/modules/core/tools/ifort.lua | 6 | ||||
| -rw-r--r-- | xmake/toolchains/ifort/load.lua | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/xmake/modules/core/tools/ifort.lua b/xmake/modules/core/tools/ifort.lua index 37871cb7c..4b79b31c4 100644 --- a/xmake/modules/core/tools/ifort.lua +++ b/xmake/modules/core/tools/ifort.lua @@ -49,10 +49,8 @@ if is_host("windows") then if not opt.rawargs then argv = winos.cmdargv(argv) end - -- @note we cannot put -lib/-dll to @args.txt - if targetkind == "static" then - table.insert(argv, 1, "-lib") - elseif targetkind == "shared" then + -- @note we cannot put -dll to @args.txt + if targetkind == "shared" then table.insert(argv, 1, "-dll") end return self:program(), argv diff --git a/xmake/toolchains/ifort/load.lua b/xmake/toolchains/ifort/load.lua index 5c31e4777..4c7d9c312 100644 --- a/xmake/toolchains/ifort/load.lua +++ b/xmake/toolchains/ifort/load.lua @@ -55,7 +55,7 @@ function _load_intel_on_windows(toolchain) end toolchain:set("toolset", "fcld", "ifort.exe") toolchain:set("toolset", "fcsh", "ifort.exe") - toolchain:set("toolset", "fcar", "link.exe") + toolchain:set("toolset", "ar", "link.exe") toolchain:set("toolset", "ex", "lib.exe") -- add ifort environments @@ -72,6 +72,7 @@ function _load_intel_on_linux(toolchain) toolchain:set("toolset", "fc", "ifort") toolchain:set("toolset", "fcld", "ifort") toolchain:set("toolset", "fcsh", "ifort") + toolchain:set("toolset", "ar", "ar") -- add march flags local march |