diff options
| author | ruki <[email protected]> | 2022-10-03 22:24:01 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-10-03 22:24:01 +0800 |
| commit | 6d958649bc0753825839cbcdb0d53aa87fe61dc2 (patch) | |
| tree | d4ebee80aae5cbb7cffe2ef749b3b98869229870 | |
| parent | 2df3a9d34657dc74babc97d54168533dab34d107 (diff) | |
| parent | 6ff2f454249c83195ff76ebaf2e61c64342ee2d7 (diff) | |
Merge pull request #2898 from culat/master
fix find Keil toolchain
| -rw-r--r-- | xmake/modules/detect/sdks/find_c51.lua | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/xmake/modules/detect/sdks/find_c51.lua b/xmake/modules/detect/sdks/find_c51.lua index 3de478507..53354e2bf 100644 --- a/xmake/modules/detect/sdks/find_c51.lua +++ b/xmake/modules/detect/sdks/find_c51.lua @@ -34,7 +34,7 @@ function _find_sdkdir(sdkdir) if sdkdir then table.insert(paths, 1, sdkdir) end - local result = find_path("C51", paths) + local result = find_path("..\\C51", paths) if not result then -- find it from some logical drives paths paths = {} @@ -65,15 +65,13 @@ function _find_c51(sdkdir) end -- c51(exe) sdk directory - local sdkdir_c51 = path.join(sdkdir, "c51") - if os.isdir(sdkdir_c51) and os.isfile(path.join(sdkdir_c51, "bin", "c51.exe")) then - result.sdkdir_c51 = sdkdir_c51 + if os.isfile(path.join(sdkdir, "bin", "c51.exe")) then + result.sdkdir_c51 = sdkdir end - -- a51 sdk directory - local sdkdir_a51 = path.join(sdkdir, "a51") - if os.isdir(sdkdir_a51) and os.isfile(path.join(sdkdir_a51, "bin", "a51.exe")) then - result.sdkdir_a51 = sdkdir_a51 + -- a51(exe) sdk directory + if os.isfile(path.join(sdkdir, "bin", "a51.exe")) then + result.sdkdir_a51 = sdkdir end return result end |