diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-07-19 08:44:55 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-07-21 15:44:33 -0500 |
commit | c1c314c36f849be027226a0c811370e9f076408a (patch) | |
tree | f96227a58fe947a0bfa61f04cc2131dc473ec8a3 /pkgs/tools/networking/openssh | |
parent | 7d010ab5f4ae6f69339139165719bf071295536b (diff) |
openssh: unset LD
Commit 093cc00cdd9d8cf31ecce5bc1dd3645c460a1b98, sets the LD environment variable by default, but this confuses the openssh Makefile because `configure' does not respect it.
Diffstat (limited to 'pkgs/tools/networking/openssh')
-rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index aaef2723da0c6..c0440e78a3895 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -60,6 +60,12 @@ stdenv.mkDerivation rec { ++ optional withKerberos kerberos ++ optional hpnSupport autoreconfHook; + preConfigure = '' + # Setting LD causes `configure' and `make' to disagree about which linker + # to use: `configure' wants `gcc', but `make' wants `ld'. + unset LD + ''; + # I set --disable-strip because later we strip anyway. And it fails to strip # properly when cross building. configureFlags = [ |