diff options
| author | Robert Maynard <rmaynard@nvidia.com> | 2021-04-05 19:13:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-04-05 20:40:43 (GMT) |
| commit | 5d44d73bbeaf04412aa744354cca9de8376cdfed (patch) | |
| tree | 755c9ae87c16bd9447e5e67d4b8fa4aa8deb685c /Modules/Platform/Linux.cmake | |
| parent | b7b0fb430397bafae4a7bd80b41d474c91a3b7f3 (diff) | |
| download | CMake-5d44d73bbeaf04412aa744354cca9de8376cdfed.zip CMake-5d44d73bbeaf04412aa744354cca9de8376cdfed.tar.gz CMake-5d44d73bbeaf04412aa744354cca9de8376cdfed.tar.bz2 | |
CMakeDetermineCompilerABI: Revert "Parse library arch from versioned paths"
The change in commit 657fc3a9a7 (CMakeDetermineCompilerABI: Parse
library arch from versioned paths, 2021-02-03, v3.20.0-rc1~40^2) caused
`CMAKE_LIBRARY_ARCHITECTURE` to be populated on non-multiarch platforms
if their compilers happen to use `$arch/$version` library directories.
Revert the use of versioned library paths.
Fixes: #22024
Diffstat (limited to 'Modules/Platform/Linux.cmake')
| -rw-r--r-- | Modules/Platform/Linux.cmake | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake index 23b48bd..b5d5464 100644 --- a/Modules/Platform/Linux.cmake +++ b/Modules/Platform/Linux.cmake @@ -48,7 +48,6 @@ endif() # Match multiarch library directory names. set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*") -set(CMAKE_LIBRARY_ARCHITECTURE_REGEX_VERSIONED "gcc/[a-z0-9_]+(-[a-z0-9_]+)?-linux(-gnu)?/[0-9]+(\\.[0-9]+\\.[0-9]+)*") include(Platform/UnixPaths) |