ostree: Use libcc for compiler runtime when using glibc for system

glibc static library expects builtins from libgcc which may not exist in compiler-rt, therefore use libgcc explicitly. Signed-off-by: Khem Raj <[email protected]>
kraj · Oct 16, 2024 · 1b2d37b · 1b2d37b
1 parent d3180c5
commit 1b2d37b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf
@@ -370,7 +370,6 @@ COMPILER_RT:remove:pn-webkitgtk:powerpc = "-rtlib=compiler-rt"
 COMPILER_RT:remove:pn-m4:armeb = "-rtlib=compiler-rt"
 COMPILER_RT:remove:pn-ruby:armeb = "-rtlib=compiler-rt"
 COMPILER_RT:remove:pn-webkitgtk:armeb = "-rtlib=compiler-rt"
-
 # build/lib/libQt5Widgets.so: undefined reference to `__lshrti3'
 # __lshrti3 is missing in libgcc
 COMPILER_RT:pn-qtbase:toolchain-clang:riscv32 = "-rtlib=compiler-rt ${UNWINDLIB}"
@@ -398,6 +397,7 @@ COMPILER_RT:pn-mpich:toolchain-clang:x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
 COMPILER_RT:pn-aufs-util:libc-glibc:toolchain-clang:x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
 COMPILER_RT:pn-libhugetlbfs:libc-glibc:toolchain-clang:x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
 COMPILER_RT:pn-tsocks:libc-glibc:toolchain-clang:x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
+COMPILER_RT:pn-ostree:toolchain-clang:libc-glibc = "-rtlib=libgcc --unwindlib=libgcc"
 
 #(unwind.o): in function `__pthread_unwind':
 #/usr/src/debug/glibc/2.29-r0/git/nptl/unwind.c:121: undefined reference to `_Unwind_ForcedUnwind'