debian/patches/158_ld_system_root.patch

   1 --- a/ld/configure.in
   2 +++ b/ld/configure.in
   3 @@ -38,7 +38,9 @@
   4   *) TARGET_SYSTEM_ROOT=$with_sysroot ;;
   5   esac
   6
   7 + if test "x$TARGET_SYSTEM_ROOT" != x/; then
   8   TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
   9 + fi
  10   use_sysroot=yes
  11
  12   if test "x$prefix" = xNONE; then
  13 --- a/ld/configure
  14 +++ b/ld/configure
  15 @@ -4139,7 +4139,9 @@
  16   *) TARGET_SYSTEM_ROOT=$with_sysroot ;;
  17   esac
  18
  19 + if test "x$TARGET_SYSTEM_ROOT" != x/; then
  20   TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
  21 + fi
  22   use_sysroot=yes
  23
  24   if test "x$prefix" = xNONE; then
  25 --- a/ld/ldmain.c
  26 +++ b/ld/ldmain.c
  27 @@ -214,8 +214,8 @@
  28      {
  29        if (*TARGET_SYSTEM_ROOT == 0)
  30         {
  31 -         einfo ("%P%F: this linker was not configured to use sysroots\n");
  32           ld_sysroot = "";
  33 +         ld_canon_sysroot = "";
  34         }
  35        else
  36         ld_canon_sysroot = lrealpath (ld_sysroot);