diff options
| author | ruki <[email protected]> | 2021-12-09 19:45:27 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-09 19:45:27 +0800 |
| commit | 2d38e89734f24660400ea4db506cc22548a167d9 (patch) | |
| tree | f2a4a0a86ffe0ceea81de729194bc3ad53909ca7 | |
| parent | 6bd17831f2f68610a229f8802e4cd7d3060c7ee8 (diff) | |
| parent | c28b02c55c235f02fad3edb5c0855ca186eeff14 (diff) | |
Merge pull request #1900 from PucklaMotzer09/ifort_lib_fix
Fix sdkdir in ifortenv and iccenv
| -rw-r--r-- | xmake/modules/detect/sdks/find_iccenv.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/detect/sdks/find_ifortenv.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xmake/modules/detect/sdks/find_iccenv.lua b/xmake/modules/detect/sdks/find_iccenv.lua index 2eb2c353c..84b40fade 100644 --- a/xmake/modules/detect/sdks/find_iccenv.lua +++ b/xmake/modules/detect/sdks/find_iccenv.lua @@ -140,7 +140,7 @@ function _find_intel_on_linux(opt) local icc = find_file("icc", paths) if icc then local bindir = path.directory(icc) - local sdkdir = path.directory(bindir) + local sdkdir = path.directory(path.directory(bindir)) return {sdkdir = sdkdir, bindir = bindir, libdir = path.join(sdkdir, "compiler", "lib", arch)} end end diff --git a/xmake/modules/detect/sdks/find_ifortenv.lua b/xmake/modules/detect/sdks/find_ifortenv.lua index 131c4b930..d851b3f6a 100644 --- a/xmake/modules/detect/sdks/find_ifortenv.lua +++ b/xmake/modules/detect/sdks/find_ifortenv.lua @@ -141,7 +141,7 @@ function _find_intel_on_linux(opt) local ifort = find_file("ifort", paths) if ifort then local bindir = path.directory(ifort) - local sdkdir = path.directory(bindir) + local sdkdir = path.directory(path.directory(bindir)) return {sdkdir = sdkdir, bindir = bindir, libdir = path.join(sdkdir, "compiler", "lib", arch)} end end |