Merge pull request #218761 from wegank/bobcat-gcc

bobcat: use gcc12Stdenv on aarch64-linux
This commit is contained in:
Weijia Wang 2023-02-28 10:54:09 +02:00 committed by GitHub
commit 18b559629a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -19183,11 +19183,11 @@ with pkgs;
else callPackage ../os-specific/linux/bionic-prebuilt { };
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;
});
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 { };