From 98a3afd78f6822b22c07054b7d47a66fc56e3056 Mon Sep 17 00:00:00 2001 From: valord577 Date: Mon, 3 Aug 2026 19:10:10 +0800 Subject: [PATCH 1/3] fix llvm build on armv7-uclibceabihf --- .github/workflows/_matrix.yml | 2 +- modules/llvm.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/_matrix.yml b/.github/workflows/_matrix.yml index 71beec9..77d85ea 100644 --- a/.github/workflows/_matrix.yml +++ b/.github/workflows/_matrix.yml @@ -29,7 +29,7 @@ on: required: false type: string container_vers: - default: "20260731T142118Z-44014fd" + default: "20260803T095003Z-f6958ec" required: false type: string diff --git a/modules/llvm.py b/modules/llvm.py index f4f0d67..8fc19cc 100755 --- a/modules/llvm.py +++ b/modules/llvm.py @@ -123,8 +123,8 @@ def _build_step_0(): arg.startswith('CMAKE_CXX_COMPILER_TARGET=') or arg.startswith('CMAKE_SYSTEM_NAME') or arg.startswith('CMAKE_CROSSCOMPILING') or -# arg.startswith('CMAKE_C_COMPILER=') or -# arg.startswith('CMAKE_CXX_COMPILER=') or + #arg.startswith('CMAKE_C_COMPILER=') or + #arg.startswith('CMAKE_CXX_COMPILER=') or False ): continue From 8cc72451b576c1010a6603988f6bd66aeac5db1a Mon Sep 17 00:00:00 2001 From: valord577 Date: Mon, 3 Aug 2026 21:31:50 +0800 Subject: [PATCH 2/3] fix llvm build on armv7-uclibceabihf --- .github/workflows/_matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_matrix.yml b/.github/workflows/_matrix.yml index 77d85ea..1a25ba3 100644 --- a/.github/workflows/_matrix.yml +++ b/.github/workflows/_matrix.yml @@ -29,7 +29,7 @@ on: required: false type: string container_vers: - default: "20260803T095003Z-f6958ec" + default: "20260803T132306Z-555080a" required: false type: string From a73ed221379409337151f080a570167fac63d131 Mon Sep 17 00:00:00 2001 From: valord577 Date: Mon, 3 Aug 2026 22:23:27 +0800 Subject: [PATCH 3/3] fix llvm build on armv7-uclibceabihf --- build_v2.py | 2 +- x_utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build_v2.py b/build_v2.py index c498143..83eb9c8 100755 --- a/build_v2.py +++ b/build_v2.py @@ -393,7 +393,7 @@ def _setctx_linux( state.cc.extend(['-march=armv7-a', '-mfpu=neon-vfpv4', '-mfloat-abi=hard']) state.ar.extend(['llvm-ar']) state.nm.extend(['llvm-nm']) - state.ldflags.extend(['-fuse-ld=lld']) + state.ldflags.extend(['-fuse-ld=lld', '-Wl,--hash-style=both']) state.objcopy.extend(['llvm-objcopy']) # pkgconf diff --git a/x_utils.py b/x_utils.py index dd61539..c38c918 100644 --- a/x_utils.py +++ b/x_utils.py @@ -131,7 +131,7 @@ def get_cross_toolchain_dir(target_plat: str) -> str: if base_env := ENVIRON.get('CROSS_TOOLCHAIN_BASE'): base = Path(base_env) dir = { - 'linux': base / 'linux310-gcc7', + 'linux': base / 'linux-libstdcxx', 'win-mingw': base / 'llvm-mingw', 'android': base / 'ndk-r27d-slim', }[target_plat]