From 01dc6df938832fe923ac394812553c0fc8a0f113 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Thu, 11 Apr 2013 09:37:50 +0530 Subject: Don't use run-via-rtld-prefix for anything other than tests run-via-rtld-prefix checks whether the program to be run is a static test and skips if it is. This is fine, except that it assumes that the program to be run is the second $^, which is true only for tests. This change creates an rtld-prefix, which is simply the dynamic linker prefix with the necessary arguments and uses that in the non-test targets. --- Makeconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Makeconfig') diff --git a/Makeconfig b/Makeconfig index 70deb1e..a3d3e70 100644 --- a/Makeconfig +++ b/Makeconfig @@ -604,6 +604,9 @@ endif # How to run a program we just linked with our library. # The program binary is assumed to be $(word 2,$^). built-program-file = $(dir $(word 2,$^))$(notdir $(word 2,$^)) +rtld-prefix = $(elf-objpfx)$(rtld-installed-name) \ + --library-path \ + $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) ifeq (yes,$(build-shared)) comma = , sysdep-library-path = \ @@ -617,9 +620,7 @@ $(subst $(empty) ,:,$(strip $(patsubst -Wl$(comma)-rpath-link=%, %,\ # empty. run-via-rtld-prefix = \ $(if $(strip $(filter $(notdir $(built-program-file)), \ - $(tests-static) $(xtests-static))),, \ - $(elf-objpfx)$(rtld-installed-name) \ - --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path))) + $(tests-static) $(xtests-static))),, $(rtld-prefix)) else run-via-rtld-prefix = endif -- cgit v1.1