m4,ruby: Set COMPILER_RT instead of playing with LDFLAGS

Signed-off-by: Khem Raj <raj.khem@gmail.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf
index 428eacf..8282782 100644
--- a/conf/nonclangable.conf
+++ b/conf/nonclangable.conf
@@ -211,8 +211,9 @@ TUNE_CCARGS_remove_pn-omxplayer_toolchain-clang = "-no-integrated-as"
 #| /usr/src/debug/ruby/2.5.1-r0/build/../ruby-2.5.1/process.c:7073: undefined reference to `__mulodi4'
 #| clang-7: error: linker command failed with exit code 1 (use -v to see invocation)
 LDFLAGS_append_pn-ruby_toolchain-clang = "${@bb.utils.contains('COMPILER_RT', '--rtlib=compiler-rt', ' -rtlib=compiler-rt', '', d)}"
-LDFLAGS_append_pn-m4_toolchain-clang = "${@bb.utils.contains('COMPILER_RT', '--rtlib=compiler-rt', ' -rtlib=compiler-rt', '', d)}"
-LDFLAGS_remove_pn-m4_powerpc = "-rtlib=compiler-rt"
+COMPILER_RT_pn-ruby_toolchain-clang = "--rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT_pn-m4_toolchain-clang = "--rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT_remove_pn-m4_powerpc = "--rtlib=compiler-rt"
 
 LDFLAGS_append_pn-gnutls_toolchain-clang_riscv64 = " -latomic"
 LDFLAGS_append_pn-harfbuzz_toolchain-clang_riscv64 = " -latomic"