Merge pull request #86631 from Atemu/aarch32-disable-libpfm

This commit is contained in:
Jörg Thalheim
2020-05-03 07:27:26 +01:00
committed by GitHub
4 changed files with 4 additions and 0 deletions
@@ -16,6 +16,7 @@
, enableSharedLibraries ? true , enableSharedLibraries ? true
, enablePFM ? !(stdenv.isDarwin , enablePFM ? !(stdenv.isDarwin
|| stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245
|| stdenv.isAarch32 # broken for the armv7l builder
) )
, enablePolly ? true , enablePolly ? true
}: }:
@@ -17,6 +17,7 @@
, enableSharedLibraries ? true , enableSharedLibraries ? true
, enablePFM ? !(stdenv.isDarwin , enablePFM ? !(stdenv.isDarwin
|| stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245
|| stdenv.isAarch32 # broken for the armv7l builder
) )
, enablePolly ? false , enablePolly ? false
}: }:
@@ -16,6 +16,7 @@
, enableSharedLibraries ? true , enableSharedLibraries ? true
, enablePFM ? !(stdenv.isDarwin , enablePFM ? !(stdenv.isDarwin
|| stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245
|| stdenv.isAarch32 # broken for the armv7l builder
) )
, enablePolly ? false , enablePolly ? false
}: }:
@@ -16,6 +16,7 @@
, enableSharedLibraries ? true , enableSharedLibraries ? true
, enablePFM ? !(stdenv.isDarwin , enablePFM ? !(stdenv.isDarwin
|| stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245
|| stdenv.isAarch32 # broken for the armv7l builder
) )
, enablePolly ? false , enablePolly ? false
}: }: