From 9e21ff8a333ab60077ff095ec3f7e77479fac453 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sun, 16 Oct 2022 22:34:20 +0200 Subject: [PATCH] strip abi part in multilib clang_rt target dir names on x32 --- x32-gcc-toolchain.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/x32-gcc-toolchain.patch b/x32-gcc-toolchain.patch index b551b90..4087f7a 100644 --- a/x32-gcc-toolchain.patch +++ b/x32-gcc-toolchain.patch @@ -29,3 +29,15 @@ } BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs)); BiarchTripleAliases.append(begin(X86Triples), end(X86Triples)); +--- llvm-15.0.2.src/projects/compiler-rt/cmake/Modules/CompilerRTUtils.cmake.orig 2022-10-04 11:29:17.000000000 +0200 ++++ llvm-15.0.2.src/projects/compiler-rt/cmake/Modules/CompilerRTUtils.cmake 2022-10-16 22:33:08.014906010 +0200 +@@ -478,7 +478,8 @@ + + function(get_compiler_rt_target arch variable) + string(FIND ${COMPILER_RT_DEFAULT_TARGET_TRIPLE} "-" dash_index) +- string(SUBSTRING ${COMPILER_RT_DEFAULT_TARGET_TRIPLE} ${dash_index} -1 triple_suffix) ++ string(SUBSTRING ${COMPILER_RT_DEFAULT_TARGET_TRIPLE} ${dash_index} -1 triple_suffix_with_abi) ++ string(REPLACE "-gnux32" "" triple_suffix ${triple_suffix_with_abi}) + if(COMPILER_RT_DEFAULT_TARGET_ONLY) + # Use exact spelling when building only for the target specified to CMake. + set(target "${COMPILER_RT_DEFAULT_TARGET_TRIPLE}") -- 2.43.0