local-rtlddir-cross

Gbp-Pq: Topic any
Gbp-Pq: Name local-rtlddir-cross.diff

diff --git a/Makeconfig b/Makeconfig
index 86a71e580213f6e5de6e619d9f3370f4365b4ae2..52049e34972e2f7b9c6feb0ba5112504f1d35c59 100644 (file)
--- a/Makeconfig
+++ b/Makeconfig
@@ -146,7 +146,7 @@ inst_slibdir = $(install_root)$(slibdir)
 ifndef rtlddir
 rtlddir = $(slibdir)
 endif
-inst_rtlddir = $(install_root)$(rtlddir)
+inst_rtlddir = $(install_root)$(slibdir)
 
 # Prefix to put on files installed in $(libdir).  For libraries `libNAME.a',
 # the prefix is spliced between `lib' and the name, so the linker switch

diff --git a/Makerules b/Makerules
index 513a0e676690d1b56b8ad68f6b48232db2ddb18a..3214feaa45c2a06131cf50ad7cfffa802c08e0e1 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -1207,7 +1207,7 @@ $(inst_libdir)/libc.so: $(common-objpfx)format.lds \
         cat $<; \
         echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
              '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
-             ' AS_NEEDED (' $(rtlddir)/$(rtld-installed-name) ') )' \
+             ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' \
        ) > $@.new
 ifeq ($(patsubst gnu%,,$(config-os)),)
        echo 'INPUT ( AS_NEEDED ( -lmachuser -lhurduser ) )' >> $@.new