diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-14 21:18:27 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-14 21:18:27 +0200 |
| commit | 6ed0fe7e450def967685ec11b789bfe32002d1c1 (patch) | |
| tree | 409bf318be731969061398dc5a11c5d3c360484f /pkgs/development/libraries/boehm-gc | |
| parent | c08042ba4b507cc0d494b1b9ca0895cc25db83d4 (diff) | |
| parent | b986078593af4108371c210ce0106b6b3e82ee20 (diff) | |
| download | nixlib-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar nixlib-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar.gz nixlib-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar.bz2 nixlib-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar.lz nixlib-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar.xz nixlib-6ed0fe7e450def967685ec11b789bfe32002d1c1.tar.zst nixlib-6ed0fe7e450def967685ec11b789bfe32002d1c1.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/build-support/fetchbower/default.nix pkgs/build-support/fetchdarcs/default.nix pkgs/build-support/fetchgx/default.nix pkgs/development/python-modules/botocore/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/tools/admin/awscli/default.nix
Diffstat (limited to 'pkgs/development/libraries/boehm-gc')
| -rw-r--r-- | pkgs/development/libraries/boehm-gc/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 35ea5471dbeb..b79900288c97 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { [ "--enable-cplusplus" ] ++ lib.optional enableLargeConfig "--enable-large-config"; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = true; # not cross; # Don't run the native `strip' when cross-compiling. dontStrip = hostPlatform != buildPlatform; |