git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From c79005d4d9991593557766ad569f48c26482399f Mon Sep 17 00:00:00 2001
   2 From: Khem Raj <raj.khem@gmail.com>
   3 Date: Mon, 6 Mar 2017 23:37:05 -0800
   4 Subject: [PATCH] binutils-cross: Do not generate linker script directories
   5
   6 We don't place target libraries within ${exec_prefix}, we'd always place these
   7 within the target sysroot within the standard library directories. Worse, the
   8 append_to_lib_path code prefixes these paths with the sysroot which makes even
   9 less sense.
  10
  11 These directories therefore don't make sense in our case and mean we have to
  12 relocate all the linker scripts if they're present. Dropping them
  13 gives a reasonable performance improvement/simplification.
  14
  15 Upstream-Status: Inappropriate
  16
  17 RP 2017/01/30
  18
  19 Signed-off-by: Khem Raj <raj.khem@gmail.com>
  20 ---
  21  ld/genscripts.sh | 25 -------------------------
  22  1 file changed, 25 deletions(-)
  23
  24 diff --git a/ld/genscripts.sh b/ld/genscripts.sh
  25 index 9fbd0c4cb8a..6be07038c9b 100755
  26 --- a/ld/genscripts.sh
  27 +++ b/ld/genscripts.sh
  28 @@ -235,31 +235,6 @@ append_to_lib_path()
  29    fi
  30  }
  31
  32 -# Always search $(tooldir)/lib, aka /usr/local/TARGET/lib when native
  33 -# except when LIBPATH=":".
  34 -if [ "${LIB_PATH}" != ":" ] ; then
  35 -  libs=
  36 -  if [ "x${TOOL_LIB}" = "x" ] ; then
  37 -    if [ "x${NATIVE}" = "xyes" ] ; then
  38 -      libs="${exec_prefix}/${target_alias}/lib"
  39 -    fi
  40 -  else
  41 -    # For multilib'ed targets, ensure both ${target_alias}/lib${LIBPATH_SUFFIX}
  42 -    # and ${TOOL_LIB}/lib${LIBPATH_SUFFIX} are in the default search path,
  43 -    # because 64bit libraries may be in both places, depending on
  44 -    # cross-development setup method (e.g.: /usr/s390x-linux/lib64
  45 -    # vs. /usr/s390-linux/lib64)
  46 -    for libpath_suffix in ${LIBPATH_SUFFIX}; do
  47 -      case "${NATIVE}:${libpath_suffix}:${TOOL_LIB}" in
  48 -       :* | *::* | *:*:*${libpath_suffix}) ;;
  49 -       *) libs="${exec_prefix}/${target_alias}/lib${libpath_suffix}" ;;
  50 -      esac
  51 -    done
  52 -    libs="${exec_prefix}/${TOOL_LIB}/lib ${libs}"
  53 -  fi
  54 -  append_to_lib_path ${libs}
  55 -fi
  56 -
  57  if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
  58    libs=${NATIVE_LIB_DIRS}
  59    if [ "x${NATIVE}" = "xyes" ] ; then