(built-program-cmd): Don't use the dynamic linker to run a binary if it is in $(tests-static).
This commit is contained in:
parent
5376629d4a
commit
8658ceda2f
|
@ -495,11 +495,15 @@ sysdep-library-path = \
|
||||||
$(subst $(empty) ,:,$(strip $(patsubst -Wl$(comma)-rpath-link=%, %,\
|
$(subst $(empty) ,:,$(strip $(patsubst -Wl$(comma)-rpath-link=%, %,\
|
||||||
$(filter -Wl$(comma)-rpath-link=%,\
|
$(filter -Wl$(comma)-rpath-link=%,\
|
||||||
$(sysdep-LDFLAGS)))))
|
$(sysdep-LDFLAGS)))))
|
||||||
|
ifeq (,$(findstring $(notdir $(built-program-file)), $(tests-static)))
|
||||||
run-program-prefix = $(elf-objpfx)$(rtld-installed-name) \
|
run-program-prefix = $(elf-objpfx)$(rtld-installed-name) \
|
||||||
--library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path))
|
--library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path))
|
||||||
else
|
else
|
||||||
run-program-prefix =
|
run-program-prefix =
|
||||||
endif
|
endif
|
||||||
|
else
|
||||||
|
run-program-prefix =
|
||||||
|
endif
|
||||||
# Never use $(run-program-prefix) for the statically-linked %-bp test programs
|
# Never use $(run-program-prefix) for the statically-linked %-bp test programs
|
||||||
built-program-cmd = $(patsubst %,$(run-program-prefix),\
|
built-program-cmd = $(patsubst %,$(run-program-prefix),\
|
||||||
$(filter-out %-bp,$(built-program-file))) \
|
$(filter-out %-bp,$(built-program-file))) \
|
||||||
|
|
Loading…
Reference in a new issue