summary refs log tree commit diff
path: root/pkgs/tools/networking/openssh
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-07-19 08:44:55 -0500
committerThomas Tuegel <ttuegel@mailbox.org>2017-07-21 15:44:33 -0500
commitc1c314c36f849be027226a0c811370e9f076408a (patch)
treef96227a58fe947a0bfa61f04cc2131dc473ec8a3 /pkgs/tools/networking/openssh
parent7d010ab5f4ae6f69339139165719bf071295536b (diff)
downloadnixlib-c1c314c36f849be027226a0c811370e9f076408a.tar
nixlib-c1c314c36f849be027226a0c811370e9f076408a.tar.gz
nixlib-c1c314c36f849be027226a0c811370e9f076408a.tar.bz2
nixlib-c1c314c36f849be027226a0c811370e9f076408a.tar.lz
nixlib-c1c314c36f849be027226a0c811370e9f076408a.tar.xz
nixlib-c1c314c36f849be027226a0c811370e9f076408a.tar.zst
nixlib-c1c314c36f849be027226a0c811370e9f076408a.zip
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.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index aaef2723da0c..c0440e78a389 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 = [