mirror of
https://git.yoctoproject.org/poky
synced 2026-03-12 18:29:42 +01:00
b4e430a42e
libtool auto detects the sysroot from gcc's parameters or configuration so we don't need to pass in this configuration separately to libtool. Whilst the option names do conflict with gcc/binutils, that is an issue for those projects to resolve, not us. Upstream libtool did reject the patch. We can drop this patch and simplify our code. (From OE-Core rev: 7c8553f81bccc3e8c2bb1116ee1e89f5f8af4c9e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
libtool.m4: Change libtool to handle sysroots by default
|
|
|
|
Rather than using no sysroot by default, always query gcc to obtain the sysroot.
|
|
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
Upstream-Status: Inappropriate [Upstream are unlikely to accept this change of default]
|
|
|
|
---
|
|
m4/libtool.m4 | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
Index: libtool-2.5.0/m4/libtool.m4
|
|
===================================================================
|
|
--- libtool-2.5.0.orig/m4/libtool.m4
|
|
+++ libtool-2.5.0/m4/libtool.m4
|
|
@@ -1253,18 +1253,18 @@ dnl lt_sysroot will always be passed unq
|
|
dnl in case the user passed a directory name.
|
|
lt_sysroot=
|
|
case $with_sysroot in #(
|
|
- yes)
|
|
+ no)
|
|
if test yes = "$GCC"; then
|
|
# Trim trailing / since we'll always append absolute paths and we want
|
|
# to avoid //, if only for less confusing output for the user.
|
|
lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\+$::'`
|
|
fi
|
|
;; #(
|
|
+ yes|''|/)
|
|
+ ;; #(
|
|
/*)
|
|
lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
|
|
;; #(
|
|
- no|'')
|
|
- ;; #(
|
|
*)
|
|
AC_MSG_RESULT([$with_sysroot])
|
|
AC_MSG_ERROR([The sysroot must be an absolute path.])
|