aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-12-15 11:21:49 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-19 17:54:12 +0000
commit9b37e630f5f6e37e928f825c4f67481cf58c98a1 (patch)
tree58463777ce9e4253891f5946ebec1243c2327951 /meta/recipes-connectivity
parent6cea10dd8f041731269ad16b94d8e172ab1f7257 (diff)
downloadopenembedded-core-contrib-9b37e630f5f6e37e928f825c4f67481cf58c98a1.tar.gz
openembedded-core-contrib-9b37e630f5f6e37e928f825c4f67481cf58c98a1.tar.bz2
openembedded-core-contrib-9b37e630f5f6e37e928f825c4f67481cf58c98a1.zip
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] Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.6p1.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
index dbcf4146ed..abc302b90f 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
@@ -49,7 +49,6 @@ inherit autotools-brokensep ptest
# LFS support:
CFLAGS += "-D__FILE_OFFSET_BITS=64"
-export LD = "${CC}"
# login path is hardcoded in sshd
EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
@@ -74,6 +73,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd"
EXTRA_OECONF_append_libc-uclibc=" --without-pam"
do_configure_prepend () {
+ export LD="${CC}"
install -m 0644 ${WORKDIR}/sshd_config ${B}/
install -m 0644 ${WORKDIR}/ssh_config ${B}/
if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then