Fix nanos6 cross-compilation for riscv

Fix cross compilation for lmbench
2025-10-09 12:43:38 +02:00 · 2025-10-09 12:43:37 +02:00
2 changed files with 7 additions and 1 deletions
--- a/pkgs/lmbench/default.nix
+++ b/pkgs/lmbench/default.nix
@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
      CFLAGS=-Wno-implicit-int
      CPPFLAGS=-I${libtirpc.dev}/include/tirpc
      LDFLAGS=-ltirpc
+      CC=$CC
+      AR=$AR
    )
  '';

--- a/pkgs/nanos6/default.nix
+++ b/pkgs/nanos6/default.nix
@ -48,6 +48,8 @@ let
  };

  source = if (useGit) then git else release;
+
+  isCross = stdenv.hostPlatform != stdenv.buildPlatform;
 in
  stdenv.mkDerivation (source // {
    pname = "nanos6";
@ -72,9 +74,11 @@ in
      "--disable-all-instrumentations"
      "--enable-ovni-instrumentation"
      "--with-ovni=${ovni}"
+      "--with-boost=${boost.dev}"
    ] ++
      (optional enableJemalloc "--with-jemalloc=${jemallocNanos6}") ++
-      (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG");
+      (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG") ++
+      (optional isCross "--with-symbol-resolution=ifunc");

    postConfigure = lib.optionalString (!enableDebug) ''
      # Disable debug
Author	SHA1	Message	Date
Aleix Boné	58a9a09c31	Fix nanos6 cross-compilation for riscv All checks were successful CI / build:all (pull_request) Successful in 1m5s Details	2025-10-09 12:43:38 +02:00
Aleix Boné	d31670f9e7	Fix cross compilation for lmbench	2025-10-09 12:43:37 +02:00