diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-05-23 11:37:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-23 11:37:43 -0400 |
| commit | ee9dc37e040dcc27fb33e26d05213243645b7765 (patch) | |
| tree | 60ce426e7a96ff1274b668ceb6c04232626c6d3d /pkgs/stdenv/generic | |
| parent | d6b9e625d5a52e57894678bd4bd51a4064249c87 (diff) | |
| parent | 4ffa8b6125c83d6e49fbe3574edc053db7ea2ec1 (diff) | |
| download | nixlib-ee9dc37e040dcc27fb33e26d05213243645b7765.tar nixlib-ee9dc37e040dcc27fb33e26d05213243645b7765.tar.gz nixlib-ee9dc37e040dcc27fb33e26d05213243645b7765.tar.bz2 nixlib-ee9dc37e040dcc27fb33e26d05213243645b7765.tar.lz nixlib-ee9dc37e040dcc27fb33e26d05213243645b7765.tar.xz nixlib-ee9dc37e040dcc27fb33e26d05213243645b7765.tar.zst nixlib-ee9dc37e040dcc27fb33e26d05213243645b7765.zip | |
Merge pull request #40933 from obsidiansystems/linux-to-darwin
stdenv, binutils: Build cctools targeting macOS on Linux without pointless rebuilds
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index e9ae54811a21..2eac9e58daa6 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -90,9 +90,14 @@ let '' + lib.optionalString hostPlatform.isDarwin '' export NIX_DONT_SET_RPATH=1 export NIX_NO_SELF_RPATH=1 - '' + lib.optionalString targetPlatform.isDarwin '' - export NIX_TARGET_DONT_SET_RPATH=1 - ''; + '' + # TODO this should be uncommented, but it causes stupid mass rebuilds. I + # think the best solution would just be to fixup linux RPATHs so we don't + # need to set `-rpath` anywhere. + # + lib.optionalString targetPlatform.isDarwin '' + # export NIX_TARGET_DONT_SET_RPATH=1 + # '' + ; inherit initialPath shell defaultNativeBuildInputs defaultBuildInputs; |