[openssh-commits] [openssh] 02/02: Remove ability to override $LD.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit f2c06ab8dd90582030991f631a2715216bf45e5a
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Fri Jun 8 17:43:36 2018 +1000

    Remove ability to override $LD.
    
    Since autoconf always uses $CC to link C programs, allowing users to
    override LD caused mismatches between what LD_LINK_IFELSE thought worked
    and what ld thought worked.  If you do need to do this kind of thing you
    need to set a compiler flag such as gcc's -fuse-ld in LDFLAGS.
---
 INSTALL      | 2 +-
 configure.ac | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/INSTALL b/INSTALL
index 7f552bf7..d5275113 100644
--- a/INSTALL
+++ b/INSTALL
@@ -220,7 +220,7 @@ If you need to pass special options to the compiler or linker, you
 can specify these as environment variables before running ./configure.
 For example:
 
-CFLAGS="-O -m486" LDFLAGS="-s" LIBS="-lrubbish" LD="/usr/foo/ld" ./configure
+CC="/usr/foo/cc" CFLAGS="-O" LDFLAGS="-s" LIBS="-lrubbish" ./configure
 
 3. Configuration
 ----------------
diff --git a/configure.ac b/configure.ac
index 7cf6d61d..c5c21f06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,9 +83,11 @@ if test ! -z "$PATH_PASSWD_PROG" ; then
 		[Full path of your "passwd" program])
 fi
 
-if test -z "$LD" ; then
-	LD=$CC
-fi
+dnl Since autoconf doesn't support it very well,  we no longer allow users to
+dnl override LD, however keeping the hook here for now in case there's a use
+dnl use case we overlooked and someone needs to re-enable it.  Unless a good
+dnl reason is found we'll be removing this in future.
+LD="$CC"
 AC_SUBST([LD])
 
 AC_C_INLINE
@@ -526,7 +528,6 @@ case "$host" in
 	    [ AC_MSG_RESULT([yes]) ],
 	    [ AC_MSG_RESULT([no])
 	      CC="`echo $CC | sed 's/-qlanglvl\=ansi//g'`"
-	      LD="`echo $LD | sed 's/-qlanglvl\=ansi//g'`"
 	      CFLAGS="`echo $CFLAGS | sed 's/-qlanglvl\=ansi//g'`"
 	      CPPFLAGS="`echo $CPPFLAGS | sed 's/-qlanglvl\=ansi//g'`"
 	    ]

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.