Fix nanos6 cross-compilation for riscv

Fix cross compilation for lmbench
2025-10-09 11:52:14 +02:00 · 2025-10-09 11:52:13 +02:00
2 changed files with 20 additions and 3 deletions
--- a/pkgs/lmbench/default.nix
+++ b/pkgs/lmbench/default.nix
@ -22,7 +22,11 @@ stdenv.mkDerivation rec {
  '';

  buildInputs = [ libtirpc ];
-  patches = [ ./fix-install.patch ./gcc-14.patch ];
+  patches = [
+    ./fix-install.patch
+    ./gcc-14.patch
+    ./fix-cross.patch
+  ];

  hardeningDisable = [ "all" ];

@ -35,8 +39,8 @@ stdenv.mkDerivation rec {
      CFLAGS=-Wno-implicit-int
      CPPFLAGS=-I${libtirpc.dev}/include/tirpc
      LDFLAGS=-ltirpc
-      CC=$CC
-      AR=$AR
+      CC=${stdenv.cc.targetPrefix}cc
+      AR=${stdenv.cc.targetPrefix}ar
    )
  '';

--- a/pkgs/lmbench/fix-cross.patch
+++ b/pkgs/lmbench/fix-cross.patch
@ -0,0 +1,13 @@
+diff --git a/src/Makefile b/src/Makefile
+index 2555014..356eeb3 100644
+--- a/src/Makefile
+++ b/src/Makefile
+@@ -36,7 +36,7 @@ SHELL=/bin/sh
+ 
+ CC=`../scripts/compiler`
+ MAKE=`../scripts/make`
+-AR=ar
+AR?=ar
+ ARCREATE=cr
+ 
+ # base of installation location
Author	SHA1	Message	Date
Aleix Boné	cc7f674f38	Fix nanos6 cross-compilation for riscv All checks were successful CI / build:all (pull_request) Successful in 18s Details	2025-10-09 11:52:14 +02:00
Aleix Boné	b0e187b4f6	Fix cross compilation for lmbench	2025-10-09 11:52:13 +02:00