local-rtlddir-cross

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

diff --git a/Makeconfig b/Makeconfig
index 1c815113b9d986d28b84c57a2514b94ee0023b79..1aac59b8cc965ed8513b0ad331994acda84dd93e 100644 (file)
--- a/Makeconfig
+++ b/Makeconfig
@@ -161,7 +161,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 ff3d96af7382b6757b9a1caff2a6d291b0cde435..f4b33e8701ef1dac57887e41692a6a54021922d3 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -1179,7 +1179,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