bobcat: remove -lgcc from NIX_LDFLAGS
This commit is contained in:
parent
ac62a206b7
commit
3cbc5144cc
|
@ -26,10 +26,6 @@ stdenv.mkDerivation rec {
|
||||||
patchShebangs .
|
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 = ''
|
buildPhase = ''
|
||||||
./build libraries all
|
./build libraries all
|
||||||
./build man
|
./build man
|
||||||
|
|
|
@ -19255,11 +19255,7 @@ with pkgs;
|
||||||
else callPackage ../os-specific/linux/bionic-prebuilt { };
|
else callPackage ../os-specific/linux/bionic-prebuilt { };
|
||||||
|
|
||||||
|
|
||||||
bobcat = callPackage ../development/libraries/bobcat {
|
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;
|
|
||||||
};
|
|
||||||
|
|
||||||
boehmgc = callPackage ../development/libraries/boehm-gc { };
|
boehmgc = callPackage ../development/libraries/boehm-gc { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue