diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-04-22 15:59:48 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-04-22 16:05:35 +0200 |
| commit | e7eb209fed6d400bab258baece1c6f6f50e14eea (patch) | |
| tree | deaf275c965a1453fc65755bab4a29c708427a7d /pkgs/stdenv/darwin | |
| parent | 56aa87374a44e3e78b8ad1a356eaed3d94884c80 (diff) | |
| download | nixpkgs-e7eb209fed6d400bab258baece1c6f6f50e14eea.tar nixpkgs-e7eb209fed6d400bab258baece1c6f6f50e14eea.tar.gz nixpkgs-e7eb209fed6d400bab258baece1c6f6f50e14eea.tar.bz2 nixpkgs-e7eb209fed6d400bab258baece1c6f6f50e14eea.tar.lz nixpkgs-e7eb209fed6d400bab258baece1c6f6f50e14eea.tar.xz nixpkgs-e7eb209fed6d400bab258baece1c6f6f50e14eea.tar.zst nixpkgs-e7eb209fed6d400bab258baece1c6f6f50e14eea.zip | |
stdenv: avoid -p flag for strip when boostrapping x86_64-darwin
The stdenv wouldn't build with it, as compiler-rt-libc-11.1.0/lib/darwin/libclang_rt.*_osx.a retained reference to SDKs (which we forbid for final stdenv). Assigned authorship to Trofi; I just bisected and added condition. https://github.com/NixOS/nixpkgs/pull/224669#issuecomment-1518225496
Diffstat (limited to 'pkgs/stdenv/darwin')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 6cc6271eedb..69a128382ff 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -63,6 +63,8 @@ rec { unset SDKROOT stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" + '' + lib.optionalString localSystem.isx86_64 '' + stripDebugFlags="-S" # the Darwin "strip" command does something odd with "-p" ''; bootstrapTools = derivation ({ |