mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-20 12:08:17 +03:00
Merge pull request #3465 from joelteon/picky-binutils
Stop binutils from trying to build on Darwin
This commit is contained in:
commit
d81303813a
@ -2,6 +2,8 @@
|
||||
, cross ? null, gold ? true, bison ? null
|
||||
}:
|
||||
|
||||
assert !stdenv.isDarwin;
|
||||
|
||||
let basename = "binutils-2.23.1"; in
|
||||
|
||||
with { inherit (stdenv.lib) optional optionals optionalString; };
|
||||
|
@ -3917,7 +3917,9 @@ let
|
||||
|
||||
bam = callPackage ../development/tools/build-managers/bam {};
|
||||
|
||||
binutils = callPackage ../development/tools/misc/binutils {
|
||||
binutils = if stdenv.isDarwin
|
||||
then stdenv.gcc.binutils
|
||||
else callPackage ../development/tools/misc/binutils {
|
||||
inherit noSysDirs;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user