Merge pull request #201003 from avdv/fix-bobcat-aarch64-linux

bobcat: Fix build on aarch64-linux
2022-11-13 21:51:09 +00:00
parent a715b68d99 f933aea9e1
commit cd5b6f4f91
2 changed files with 8 additions and 1 deletions
@@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
    patchShebangs .
  '';

+  # have to link to static gcc lib on aarch64-linux explicitly
+  NIX_LDFLAGS = lib.optionalString (with stdenv.targetPlatform; isAarch64 && isLinux) "-lgcc";
+
  buildPhase = ''
    ./build libraries all
    ./build man
@@ -18271,7 +18271,11 @@ with pkgs;
    else callPackage ../os-specific/linux/bionic-prebuilt { };


-  bobcat = callPackage ../development/libraries/bobcat { };
+  bobcat = callPackage ../development/libraries/bobcat
+    (lib.optionalAttrs (with stdenv.hostPlatform; isAarch64 && isLinux) {
+      # C++20 is required, aarch64-linux has gcc 9 by default
+      stdenv = gcc10Stdenv;
+    });

  boehmgc = callPackage ../development/libraries/boehm-gc { };