diff options
author | Dan Peebles <pumpkin@me.com> | 2018-09-15 16:49:44 -0400 |
---|---|---|
committer | Dan Peebles <pumpkin@me.com> | 2018-09-16 02:12:11 -0400 |
commit | 110c2528709ee10466a6b4bee5a2adefe11a0c3f (patch) | |
tree | eb398c8ec993c79ba28756b1c7484b8cc9c730c0 /pkgs/os-specific/darwin | |
parent | b91ad0e54f6a44737198b8cbcea67467ec991aee (diff) | |
download | nixpkgs-110c2528709ee10466a6b4bee5a2adefe11a0c3f.tar nixpkgs-110c2528709ee10466a6b4bee5a2adefe11a0c3f.tar.gz nixpkgs-110c2528709ee10466a6b4bee5a2adefe11a0c3f.tar.bz2 nixpkgs-110c2528709ee10466a6b4bee5a2adefe11a0c3f.tar.lz nixpkgs-110c2528709ee10466a6b4bee5a2adefe11a0c3f.tar.xz nixpkgs-110c2528709ee10466a6b4bee5a2adefe11a0c3f.tar.zst nixpkgs-110c2528709ee10466a6b4bee5a2adefe11a0c3f.zip |
cctools: support LTO on Darwin
LTO is disabled during bootstrap to keep the bootstrap tools small and avoid unnecessary LLVM rebuilds, but is enabled in the final stdenv stage and should be usable by normal packages.
Diffstat (limited to 'pkgs/os-specific/darwin')
-rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/darwin/cctools/port.nix | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix index 89ff68266a2..761ff3ea925 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix @@ -1,8 +1,6 @@ -{ cctools, appleDerivation }: +{ appleDerivation }: appleDerivation { - nativeBuildInputs = [ cctools ]; - patches = [ ./clang-5.patch ]; postPatch = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index d490048c4df..4fa0c0e3e47 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -215,7 +215,7 @@ let # Splicing is currently broken in Nixpkgs # cctools need to be specified manually here to handle this - ICU = applePackage "ICU" "osx-10.10.5" "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" { inherit (buildPackages.darwin) cctools; }; + ICU = applePackage "ICU" "osx-10.10.5" "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" {}; IOKit = applePackage "IOKit" "osx-10.11.6" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; }; launchd = applePackage "launchd" "osx-10.9.5" "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {}; diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index fff6eaaa5c1..bad17cf6de4 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool_2, autoreconfHook -, libcxxabi, libuuid +, libcxxabi, libuuid, llvm , libobjc ? null, maloader ? null , enableDumpNormalizedLibArgs ? false }: @@ -56,7 +56,7 @@ let autoreconfHook ]; buildInputs = [ libuuid ] ++ - stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]; + stdenv.lib.optionals stdenv.isDarwin [ llvm libcxxabi libobjc ]; patches = [ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch |