qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makeconfig: Support $(+nolink-deps) in link flags 

This allows adding dependencies to rules, but not linking against
them.

This is more or less a reimplementation of .EXTRA_PREREQS feature from
GNU make 4.3.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Florian Weimer 2025-03-21 21:40:28 +01:00
parent ed6a68bac7
commit c3410db9d0
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makeconfig
View File

@ -442,7 +442,8 @@ ifndef +link-pie
$(filter-out $(addprefix $(csu-objpfx),start.o \ $(filter-out $(addprefix $(csu-objpfx),start.o \
S$(start-installed-name))\ S$(start-installed-name))\
$(+preinit) $(link-extra-libs) \ $(+preinit) $(link-extra-libs) \
$(common-objpfx)libc% $(+postinit),$^) \ $(common-objpfx)libc% $(+postinit) \
$(+nolink-deps),$^) \
$(link-extra-libs) $(link-extra-libs)
+link-pie-after-libc = $(+postctorS) $(+postinit) +link-pie-after-libc = $(+postctorS) $(+postinit)
define +link-pie define +link-pie
@ -473,7 +474,8 @@ ifndef +link-static
$(filter-out $(addprefix $(csu-objpfx),start.o \ $(filter-out $(addprefix $(csu-objpfx),start.o \
$(start-installed-name))\ $(start-installed-name))\
$(+preinit) $(link-extra-libs-static) \ $(+preinit) $(link-extra-libs-static) \
$(common-objpfx)libc% $(+postinit),$^) \ $(common-objpfx)libc% $(+postinit) \
$(+nolink-deps), $^) \
$(link-extra-libs-static) $(link-extra-libs-static)
+link-static-after-libc = $(+postctorT) $(+postinit) +link-static-after-libc = $(+postctorT) $(+postinit)
define +link-static define +link-static
@ -509,7 +511,8 @@ else # not build-pie-default
$(filter-out $(addprefix $(csu-objpfx),start.o \ $(filter-out $(addprefix $(csu-objpfx),start.o \
$(start-installed-name))\ $(start-installed-name))\
$(+preinit) $(link-extra-libs) \ $(+preinit) $(link-extra-libs) \
$(common-objpfx)libc% $(+postinit),$^) \ $(common-objpfx)libc% $(+postinit) \
$(+nolink-deps),$^) \
$(link-extra-libs) $(link-extra-libs)
+link-after-libc = $(+postctor) $(+postinit) +link-after-libc = $(+postctor) $(+postinit)
define +link define +link
@ -549,7 +552,8 @@ endif # +link
$(filter-out $(addprefix $(csu-objpfx),start.o \ $(filter-out $(addprefix $(csu-objpfx),start.o \
$(start-name-2.0))\ $(start-name-2.0))\
$(+preinit) $(link-extra-libs) \ $(+preinit) $(link-extra-libs) \
$(common-objpfx)libc% $(+postinit),$^) \ $(common-objpfx)libc% $(+postinit) \
$(+nolink-deps),$^) \
$(link-extra-libs) $(link-extra-libs)
+link-after-libc = $(+postctor) $(+postinit) +link-after-libc = $(+postctor) $(+postinit)
define +link-2.0-tests define +link-2.0-tests

2
Makerules
View File

@ -587,7 +587,7 @@ endef
build-module-helper-objlist = \ build-module-helper-objlist = \
$(patsubst %_pic.a,$(whole-archive) %_pic.a $(no-whole-archive),\ $(patsubst %_pic.a,$(whole-archive) %_pic.a $(no-whole-archive),\
$(filter-out %.lds $(map-file) $(+preinit) $(+postinit) \ $(filter-out %.lds $(map-file) $(+preinit) $(+postinit) \
$(elf-objpfx)sofini.os \ $(elf-objpfx)sofini.os $(+nolink-deps) \
$(link-libc-deps),$^)) $(link-libc-deps),$^))
build-module-objlist = $(build-module-helper-objlist) $(LDLIBS-$(@F:%.so=%).so) build-module-objlist = $(build-module-helper-objlist) $(LDLIBS-$(@F:%.so=%).so)