diff options
| author | ruki <[email protected]> | 2023-07-03 23:49:22 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2023-07-03 23:49:22 +0800 |
| commit | d51436e3270669de347d04c7dface8e248a3bd0d (patch) | |
| tree | b27d375c5c4e5628af9a4d24ae9535a3c2c13ea2 | |
| parent | 087be99d586ed93ac76cf52d56e31b14ea7f6b55 (diff) | |
improve gcc/clang for tools.cmake #3913
| -rw-r--r-- | xmake/modules/package/tools/cmake.lua | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index d9a34220a..f25ec2ce9 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -486,9 +486,11 @@ function _get_configs_for_cross(package, configs, opt) local dir = path.directory(cxx) local name = path.filename(cxx) name = name:gsub("clang$", "clang++") - name = name:gsub("clang%-", "clang++-") + name = name:gsub("clang%-", "clang++-") -- clang-xx + name = name:gsub("clang%.", "clang++.") -- clang.exe name = name:gsub("gcc$", "g++") name = name:gsub("gcc%-", "g++-") + name = name:gsub("gcc%.", "g++.") if dir and dir ~= "." then cxx = path.join(dir, name) else @@ -561,8 +563,10 @@ function _get_configs_for_host_toolchain(package, configs, opt) local name = path.filename(cxx) name = name:gsub("clang$", "clang++") name = name:gsub("clang%-", "clang++-") + name = name:gsub("clang%.", "clang++.") name = name:gsub("gcc$", "g++") name = name:gsub("gcc%-", "g++-") + name = name:gsub("gcc%.", "g++.") if dir and dir ~= "." then cxx = path.join(dir, name) else |