aboutsummaryrefslogtreecommitdiff
path: root/pkgs/stdenv/darwin
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2019-06-16 19:59:06 +0000
committerAlyssa Ross <hi@alyssa.is>2019-06-16 19:59:05 +0000
commitf3282c8d1e0ce6ba5d9f6aeddcfad51d879c7a4a (patch)
treefc248141d976626274065a36839f64bd2dd3db99 /pkgs/stdenv/darwin
parentccee4117be08f0474640e06f76a7881389fb7b47 (diff)
treewide: remove unused variables (#63177)
* treewide: remove unused variables * making ofborg happy
Diffstat (limited to 'pkgs/stdenv/darwin')
-rw-r--r--pkgs/stdenv/darwin/default.nix1
-rw-r--r--pkgs/stdenv/darwin/make-bootstrap-tools.nix4
2 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 20062bba8ee..f7a40bb0d0e 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -199,7 +199,6 @@ in rec {
ninja = super.ninja.override { buildDocs = false; };
darwin = super.darwin // {
cctools = super.darwin.cctools.override {
- llvm = null;
enableTapiSupport = false;
};
};
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index cfa8aac0578..a299879693c 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -12,9 +12,7 @@ in rec {
singleBinary = false;
});
- # We want a version of cctools without LLVM, because the LTO support ends up making
- # the bootstrap tools huge and isn't really necessary for bootstrap
- cctools_ = darwin.cctools.override { llvm = null; };
+ cctools_ = darwin.cctools;
# Avoid debugging larger changes for now.
bzip2_ = bzip2.override (args: { linkStatic = true; });