From d8e3a319e3b123661b2db3c4305b57a725bccfb9 Mon Sep 17 00:00:00 2001 From: Tom Rothamel Date: Wed, 2 Oct 2024 20:53:24 -0400 Subject: [PATCH] Back out a linker change from #133. The problem was that the newer system lld doesn't like some symbols in ancient libGLs used on Linux platforms. --- renpybuild/run.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/renpybuild/run.py b/renpybuild/run.py index ed8d50c..45754fb 100644 --- a/renpybuild/run.py +++ b/renpybuild/run.py @@ -52,7 +52,11 @@ def llvm(c, bin="", prefix="", suffix="-15", clang_args="", use_ld=True): ld = c.expand("{{llvm_bin}}lld{{llvm_suffix}}") if use_ld: - clang_args = "-fuse-ld=lld -Wno-unused-command-line-argument " + clang_args + if c.platform == "linux": + # Needed until we upgrade the linux sysroot to a version compatible with newer clangs. + clang_args = "-fuse-ld=" + ld + " -Wno-unused-command-line-argument " + clang_args + else: + clang_args = "-fuse-ld=lld -Wno-unused-command-line-argument " + clang_args if c.platform == "ios": c.var("cxx_clang_args", "-stdlib=libc++ -I{{cross}}/sdk/usr/include/c++")