Skip to content

Commit 4e61f52

Browse files
committed
fix nix loong64
1 parent 05dbfe8 commit 4e61f52

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
packages.aarch64-linux.pkgsCross.riscv64.libdebuginfod-zig-static, # riscv64
1919
packages.aarch64-linux.pkgsCross.s390x.libdebuginfod-zig-static, # s390x
2020
packages.aarch64-linux.pkgsCross.powernv.libdebuginfod-zig-static, # ppc64le
21-
packages.aarch64-linux.pkgsCross.ppc64.libdebuginfod-zig-static, # ppc64
21+
# packages.aarch64-linux.pkgsCross.ppc64.libdebuginfod-zig-static, # ppc64, stdenv slow compilation
2222
packages.aarch64-linux.pkgsCross.loongarch64-linux.libdebuginfod-zig-static, # loong64
2323
]
2424
runs-on: ubuntu-24.04-arm # aarch64-linux

pkg.nix

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@
1111
let
1212
isCross = stdenv.buildPlatform.system != stdenv.targetPlatform.system;
1313
isSameOS = stdenv.buildPlatform.parsed.kernel.name == stdenv.targetPlatform.parsed.kernel.name;
14+
15+
glibcVersion = if stdenv.targetPlatform.isLoongArch64 then "2.36" else "2.28";
16+
1417
zigTarget =
1518
if stdenv.targetPlatform.isLinux && stdenv.targetPlatform.is32bit then
16-
"-Dtarget=${stdenv.targetPlatform.parsed.cpu.family}-linux-${stdenv.targetPlatform.parsed.abi.name}.2.28"
19+
"-Dtarget=${stdenv.targetPlatform.parsed.cpu.family}-linux-${stdenv.targetPlatform.parsed.abi.name}.${glibcVersion}"
1720
else if stdenv.targetPlatform.isLinux then
18-
"-Dtarget=${stdenv.targetPlatform.parsed.cpu.name}-linux-${stdenv.targetPlatform.parsed.abi.name}.2.28"
21+
"-Dtarget=${stdenv.targetPlatform.parsed.cpu.name}-linux-${stdenv.targetPlatform.parsed.abi.name}.${glibcVersion}"
1922
else if stdenv.targetPlatform.isDarwin then
2023
"-Dtarget=${stdenv.targetPlatform.parsed.cpu.name}-macos.${stdenv.targetPlatform.darwinSdkVersion}"
2124
else

0 commit comments

Comments
 (0)