diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makeconfig | 5 | ||||
| -rw-r--r-- | elf/Makefile | 2 | ||||
| -rw-r--r-- | nptl/ChangeLog | 7 | ||||
| -rw-r--r-- | nptl/Makefile | 6 | ||||
| -rw-r--r-- | posix/Makefile | 4 | ||||
| -rw-r--r-- | rt/Makefile | 2 |
7 files changed, 29 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 19791f6395..8eb75d0a43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2012-10-23 Jim Blandy <jimb@codesourcery.com> + Joseph Myers <joseph@codesourcery.com> + + * Makeconfig (host-built-program-cmd): New variable. + * elf/Makefile (tst-stackguard1-ARGS): Use + $(host-built-program-cmd). + * posix/Makefile (tst-exec-ARGS): Use $(host-built-program-cmd). + (tst-spawn-ARGS): Likewise. + * rt/Makefile (tst-mqueue7-ARGS): Use $(host-built-program-cmd). + 2012-10-23 Joseph Myers <joseph@codesourcery.com> Jim Blandy <jimb@codesourcery.com> diff --git a/Makeconfig b/Makeconfig index 0a78b76e3a..4481cb38c5 100644 --- a/Makeconfig +++ b/Makeconfig @@ -597,6 +597,11 @@ run-program-prefix = $(run-via-rtld-prefix) # second dependency of the makefile target in which # $(built-program-cmd) is used. built-program-cmd = $(run-via-rtld-prefix) $(built-program-file) +# $(host-built-program-cmd) is a command that, executed on the host +# for which the library is built, runs the newly built program that is +# the second dependency of the makefile target in which +# $(host-built-program-cmd) is used. +host-built-program-cmd = $(run-via-rtld-prefix) $(built-program-file) ifndef LD LD := ld -X diff --git a/elf/Makefile b/elf/Makefile index dde94091c7..c8ae77d8a0 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1046,7 +1046,7 @@ order2mod2.so-no-z-defs = yes LDFLAGS-order2mod1.so = $(no-as-needed) LDFLAGS-order2mod2.so = $(no-as-needed) -tst-stackguard1-ARGS = --command "$(built-program-cmd) --child" +tst-stackguard1-ARGS = --command "$(host-built-program-cmd) --child" tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child" $(objpfx)tst-leaks1: $(libdl) diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 6154e61c67..10b08426bb 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2012-10-23 Jim Blandy <jimb@codesourcery.com> + Joseph Myers <joseph@codesourcery.com> + + * Makefile (tst-cancel7-ARGS): Use $(host-built-program-cmd). + (tst-exec4-ARGS): Likewise. + (tst-stackguard1-ARGS): Likewise. + 2012-10-21 Jim Blandy <jimb@codesourcery.com> Joseph Myers <joseph@codesourcery.com> diff --git a/nptl/Makefile b/nptl/Makefile index bc563f8969..c37071948f 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -439,7 +439,7 @@ CFLAGS-tst-initializers1-c99.c = $(CFLAGS-tst-initializers1-<) CFLAGS-tst-initializers1-gnu89.c = $(CFLAGS-tst-initializers1-<) CFLAGS-tst-initializers1-gnu99.c = $(CFLAGS-tst-initializers1-<) -tst-cancel7-ARGS = --command "$(built-program-cmd)" +tst-cancel7-ARGS = --command "$(host-built-program-cmd)" tst-cancelx7-ARGS = $(tst-cancel7-ARGS) tst-umask1-ARGS = $(objpfx)tst-umask1.temp @@ -595,7 +595,7 @@ $(objpfx)tst-cancel-wrappers.out: tst-cancel-wrappers.sh endif endif -tst-exec4-ARGS = $(built-program-cmd) +tst-exec4-ARGS = $(host-built-program-cmd) $(objpfx)tst-execstack: $(libdl) $(objpfx)tst-execstack.out: $(objpfx)tst-execstack-mod.so @@ -603,7 +603,7 @@ LDFLAGS-tst-execstack = -Wl,-z,noexecstack $(objpfx)tst-fini1mod.so: $(shared-thread-library) -tst-stackguard1-ARGS = --command "$(built-program-cmd) --child" +tst-stackguard1-ARGS = --command "$(host-built-program-cmd) --child" tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child" # The tests here better do not run in parallel diff --git a/posix/Makefile b/posix/Makefile index 6e3d0bb3fd..f82fff93bb 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -170,8 +170,8 @@ CFLAGS-execlp.os = -fomit-frame-pointer tstgetopt-ARGS = -a -b -cfoobar --required foobar --optional=bazbug \ --none random --col --color --colour -tst-exec-ARGS = -- $(built-program-cmd) -tst-spawn-ARGS = -- $(built-program-cmd) +tst-exec-ARGS = -- $(host-built-program-cmd) +tst-spawn-ARGS = -- $(host-built-program-cmd) tst-dir-ARGS = `pwd` `cd $(common-objdir)/$(subdir); pwd` `cd $(common-objdir); pwd` $(objpfx)tst-dir tst-chmod-ARGS = $(objdir) tst-vfork3-ARGS = --test-dir=$(objpfx) diff --git a/rt/Makefile b/rt/Makefile index 941c471688..26d4ffaaf6 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -77,4 +77,4 @@ ifeq (yes,$(build-bounded)) $(tests:%=$(objpfx)%-bp): $(objpfx)librt_b.a $(bounded-thread-library) endif -tst-mqueue7-ARGS = -- $(built-program-cmd) +tst-mqueue7-ARGS = -- $(host-built-program-cmd) |