b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

bobcat: remove -lgcc from NIX_LDFLAGS

Browse source
This commit is contained in:
Weijia Wang 2023-03-04 00:26:18 +02:00
parent ac62a206b7
commit 3cbc5144cc
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/bobcat/default.nix
View file

@ -26,10 +26,6 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
# have to link to static gcc lib on aarch64-linux explicitly
# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (with stdenv.targetPlatform; isAarch64 && isLinux) "-lgcc";
buildPhase = ''
./build libraries all
./build man

6
pkgs/top-level/all-packages.nix
View file

@ -19255,11 +19255,7 @@ with pkgs;
else callPackage ../os-specific/linux/bionic-prebuilt { };
bobcat = callPackage ../development/libraries/bobcat {
# C++20 is required, aarch64-linux has gcc 9 by default
# https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv;
};
bobcat = callPackage ../development/libraries/bobcat { };
boehmgc = callPackage ../development/libraries/boehm-gc { };