diff options
| author | Dan Peebles <pumpkin@me.com> | 2016-10-16 20:46:36 -0400 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2016-10-16 20:46:36 -0400 |
| commit | ead242498132ae3b4a2c547f7cadbccb26c9c5a6 (patch) | |
| tree | 5e5d1e801dd280c3ef6fd2dc2530b2c14a1862c0 /pkgs/os-specific/darwin | |
| parent | b91d64463f060b05774e5cbfd589dcceca823973 (diff) | |
| download | nixlib-ead242498132ae3b4a2c547f7cadbccb26c9c5a6.tar nixlib-ead242498132ae3b4a2c547f7cadbccb26c9c5a6.tar.gz nixlib-ead242498132ae3b4a2c547f7cadbccb26c9c5a6.tar.bz2 nixlib-ead242498132ae3b4a2c547f7cadbccb26c9c5a6.tar.lz nixlib-ead242498132ae3b4a2c547f7cadbccb26c9c5a6.tar.xz nixlib-ead242498132ae3b4a2c547f7cadbccb26c9c5a6.tar.zst nixlib-ead242498132ae3b4a2c547f7cadbccb26c9c5a6.zip | |
cctools: fix triple for the assembler
This was breaking `boost155` and would probably break anything else that calls `as` with no explicit architecture.
Diffstat (limited to 'pkgs/os-specific/darwin')
| -rw-r--r-- | pkgs/os-specific/darwin/cctools/port.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index af713bf61dd4..2f13277d70c7 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -22,6 +22,9 @@ let patches = [ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed. + ./undo-unknown-triple.patch ]; enableParallelBuilding = true; |