diff options
| author | Robert Maynard <rmaynard@nvidia.com> | 2021-04-05 15:13:42 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-04-05 16:40:43 -0400 |
| commit | 5d44d73bbeaf04412aa744354cca9de8376cdfed (patch) | |
| tree | 755c9ae87c16bd9447e5e67d4b8fa4aa8deb685c /Modules/CMakeParseLibraryArchitecture.cmake | |
| parent | b7b0fb430397bafae4a7bd80b41d474c91a3b7f3 (diff) | |
| download | cmake-5d44d73bbeaf04412aa744354cca9de8376cdfed.tar.gz | |
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/CMakeParseLibraryArchitecture.cmake')
| -rw-r--r-- | Modules/CMakeParseLibraryArchitecture.cmake | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/Modules/CMakeParseLibraryArchitecture.cmake b/Modules/CMakeParseLibraryArchitecture.cmake index aa6fd741d7..f2bb07a658 100644 --- a/Modules/CMakeParseLibraryArchitecture.cmake +++ b/Modules/CMakeParseLibraryArchitecture.cmake @@ -22,17 +22,6 @@ function(cmake_parse_library_architecture implicit_dirs output_var) endforeach() endif() - if(CMAKE_LIBRARY_ARCHITECTURE_REGEX_VERSIONED AND NOT library_arch) - foreach(dir ${implicit_dirs}) - if("${dir}" MATCHES "/${CMAKE_LIBRARY_ARCHITECTURE_REGEX_VERSIONED}$") - get_filename_component(arch "${dir}" DIRECTORY) - get_filename_component(arch "${arch}" NAME) - set(library_arch "${arch}") - break() - endif() - endforeach() - endif() - if(CMAKE_CXX_COMPILER_ID STREQUAL QCC) foreach(dir ${implicit_dirs}) if (dir MATCHES "/lib$") |