Unverified Commit 312e20a3 authored by Randy Eckenrode's avatar Randy Eckenrode
Browse files

darwin.stdenv: fix scons Python override 

This reduces the number of Python builds in the bootstrap to two: a minimal build and a normal build. Both have LTO disabled, which is required due to missing LLVM LTO libraries. This is necessary to correctly enable LTO builds in Python because it needs `llvm-ar` from `stdenv.cc.cc.libllvm`, which does not exist in the bootstrap.
parent be3262ba

pkgs/stdenv/darwin/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -547,6 +547,8 @@ in 
        buildInputs = old.buildInputs or [ ] ++ [ self.darwin.CF ];

      });



      scons = super.scons.override { python3Packages = self.python3Minimal.pkgs; };



      darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {

        apple_sdk = superDarwin.apple_sdk // {

          inherit (prevStage.darwin.apple_sdk) sdkRoot;