aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-12-15 11:21:49 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-06 14:48:17 +0000
commitb38f33c96b31c807306dd8b2d7b25cf8fad21026 (patch)
treec44063abf17de48e3ecf41be45fdb0fe21ff1ee7
parentcb3c7cfe00e96580db5aedc7f7c0970378ab3c6e (diff)
downloadopenembedded-core-b38f33c96b31c807306dd8b2d7b25cf8fad21026.zip
openembedded-core-b38f33c96b31c807306dd8b2d7b25cf8fad21026.tar.gz
openembedded-core-b38f33c96b31c807306dd8b2d7b25cf8fad21026.tar.bz2
openssh: move setting LD to allow for correct override
Using the export LD in the recipe does not allow for secodnary toolchain overriding LD later, by setting it in the do_configure_append the export is used by autotools setting LD based on the env, but would allow for override later. [YOCTO #6997] (From OE-Core rev: 9b37e630f5f6e37e928f825c4f67481cf58c98a1) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Conflicts: meta/recipes-connectivity/openssh/openssh_6.5p1.bb
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.5p1.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
index cf83fb4..20c0407 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
@@ -54,7 +54,6 @@ inherit autotools-brokensep
# LFS support:
CFLAGS += "-D__FILE_OFFSET_BITS=64"
-export LD = "${CC}"
# login path is hardcoded in sshd
EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
@@ -79,6 +78,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd"
EXTRA_OECONF_append_libc-uclibc=" --without-pam"
do_configure_prepend () {
+ export LD="${CC}"
if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
cp aclocal.m4 acinclude.m4
fi