blob: 536b480e006a79a1321f1902f9103ecfa50b53e5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
Description: Install ld.so to slibdir instead of rtlddir to fix cross builds
When installing a cross-libc purely for linking purposes but not
runtime use, the linker shouldn't be installed in rtlddir, since
we won't actually be USING it, and thus referencing the rtlddir
path in libc.so ends up blowing up cross-compilers for no reason.
Author: Adam Conrad <adconrad@ubuntu.com>
Index: glibc-2.31-2038/Makeconfig
===================================================================
--- glibc-2.31-2038.orig/Makeconfig
+++ glibc-2.31-2038/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
Index: glibc-2.31-2038/Makerules
===================================================================
--- glibc-2.31-2038.orig/Makerules
+++ glibc-2.31-2038/Makerules
@@ -1102,7 +1102,7 @@ $(inst_libdir)/libc.so: $(common-objpfx)
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
mv -f $@.new $@
|
