mirror of
https://git.musl-libc.org/git/musl
synced 2025-03-15 23:22:57 +03:00
don't suppress shared libc when linker lacks -Bsymbolic-functions
previous work overhauling the dynamic linker made it so that linking libc with -Bsymbolic-functions was no longer mandatory, but the configure logic that forced --disable-shared when ld failed to accept the option was left in place. this commit removes the hard-coded -Bsymbolic-functions from the Makefile and changes the configure test to one that simply adds it to the auto-detected LDFLAGS on success.
This commit is contained in:
parent
c18d05f0e8
commit
65498f289b
3
Makefile
3
Makefile
@ -159,8 +159,7 @@ obj/%.lo: $(srcdir)/%.c $(GENH) $(IMPH)
|
||||
|
||||
lib/libc.so: $(LOBJS) $(LDSO_OBJS)
|
||||
$(CC) $(CFLAGS_ALL) $(LDFLAGS_ALL) -nostdlib -shared \
|
||||
-Wl,-e,_dlstart -Wl,-Bsymbolic-functions \
|
||||
-o $@ $(LOBJS) $(LDSO_OBJS) $(LIBCC)
|
||||
-Wl,-e,_dlstart -o $@ $(LOBJS) $(LDSO_OBJS) $(LIBCC)
|
||||
|
||||
lib/libc.a: $(AOBJS)
|
||||
rm -f $@
|
||||
|
13
configure
vendored
13
configure
vendored
@ -565,15 +565,10 @@ tryldflag LDFLAGS_AUTO -Wl,--no-undefined
|
||||
# versions built without shared library support and pcc are broken.
|
||||
tryldflag LDFLAGS_AUTO -Wl,--exclude-libs=ALL
|
||||
|
||||
test "$shared" = "no" || {
|
||||
# Disable dynamic linking if ld is broken and can't do -Bsymbolic-functions
|
||||
LDFLAGS_DUMMY=
|
||||
tryldflag LDFLAGS_DUMMY -Wl,-Bsymbolic-functions || {
|
||||
test "$shared" = "yes" && fail "$0: error: linker cannot build shared library"
|
||||
printf "warning: disabling dynamic linking support\n"
|
||||
shared=no
|
||||
}
|
||||
}
|
||||
# Linking with -Bsymbolic-functions is no longer mandatory for
|
||||
# the dynamic linker to work, but enable it if it works as
|
||||
# a linking optimization.
|
||||
tryldflag LDFLAGS_AUTO -Wl,-Bsymbolic-functions
|
||||
|
||||
# Find compiler runtime library
|
||||
test -z "$LIBCC" && tryldflag LIBCC -lgcc && tryldflag LIBCC -lgcc_eh
|
||||
|
Loading…
x
Reference in New Issue
Block a user