summaryrefslogtreecommitdiffstats
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:56:07 +0000
commitc088bac2f021950f5beca9b1bf333fc122231790 (patch)
tree72eb3d3e898f9aea4d1633dbd50cbe43d3c814d1
parent9766c76268fba304158594c41b2b52f134701bc6 (diff)
downloadpoky-c088bac2f021950f5beca9b1bf333fc122231790.tar.gz
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) (From OE-Core rev: b38f33c96b31c807306dd8b2d7b25cf8fad21026) 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 cf83fb4202..20c0407aac 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
54 54
55# LFS support: 55# LFS support:
56CFLAGS += "-D__FILE_OFFSET_BITS=64" 56CFLAGS += "-D__FILE_OFFSET_BITS=64"
57export LD = "${CC}"
58 57
59# login path is hardcoded in sshd 58# login path is hardcoded in sshd
60EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \ 59EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
@@ -79,6 +78,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd"
79EXTRA_OECONF_append_libc-uclibc=" --without-pam" 78EXTRA_OECONF_append_libc-uclibc=" --without-pam"
80 79
81do_configure_prepend () { 80do_configure_prepend () {
81 export LD="${CC}"
82 if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then 82 if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
83 cp aclocal.m4 acinclude.m4 83 cp aclocal.m4 acinclude.m4
84 fi 84 fi