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 /Tests/RunCMake/ParseImplicitLinkInfo/results/linux-C-XL-16.1.0.0.output | |
| 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 'Tests/RunCMake/ParseImplicitLinkInfo/results/linux-C-XL-16.1.0.0.output')
| -rw-r--r-- | Tests/RunCMake/ParseImplicitLinkInfo/results/linux-C-XL-16.1.0.0.output | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/results/linux-C-XL-16.1.0.0.output b/Tests/RunCMake/ParseImplicitLinkInfo/results/linux-C-XL-16.1.0.0.output index cd672d5..b88a48d 100644 --- a/Tests/RunCMake/ParseImplicitLinkInfo/results/linux-C-XL-16.1.0.0.output +++ b/Tests/RunCMake/ParseImplicitLinkInfo/results/linux-C-XL-16.1.0.0.output @@ -1,3 +1,3 @@ libs=xlopt;xl;dl;gcc_s;pthread;gcc;m;c;gcc_s;gcc dirs=/opt/ibm/xlsmp/5.1.0/lib;/opt/ibm/xlmass/9.1.0/lib;/opt/ibm/xlC/16.1.0/lib;/usr/lib/gcc/ppc64le-redhat-linux/4.8.5;/usr/lib64;/lib64;/usr/lib -library_arch=ppc64le-redhat-linux +library_arch= |