diff options
| -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 |