From b38f33c96b31c807306dd8b2d7b25cf8fad21026 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 15 Dec 2014 11:21:49 -0800 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Conflicts: meta/recipes-connectivity/openssh/openssh_6.5p1.bb --- meta/recipes-connectivity/openssh/openssh_6.5p1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta') 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 # 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 -- cgit 1.2.3-korg