diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile | 2 |
2 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2018-12-04 Joseph Myers <joseph@codesourcery.com> + + * Makefile ($(objpfx)testroot.pristine/install.stamp): Do not run + dynamic linker unless [$(run-built-tests) = yes]. + 2018-12-03 DJ Delorie <dj@delorie.com> * support/test-container.c (check_for_unshare_hints): New. @@ -374,6 +374,7 @@ $(objpfx)testroot.pristine/install.stamp : cp $(objpfx)support/shell-container $(objpfx)testroot.pristine/bin/sh cp $(objpfx)support/echo-container $(objpfx)testroot.pristine/bin/echo cp $(objpfx)support/true-container $(objpfx)testroot.pristine/bin/true +ifeq ($(run-built-tests),yes) # Copy these DSOs first so we can overwrite them with our own. for dso in `$(test-wrapper-env) LD_TRACE_LOADED_OBJECTS=1 \ $(objpfx)elf/$(rtld-installed-name) \ @@ -393,6 +394,7 @@ $(objpfx)testroot.pristine/install.stamp : mkdir -p `dirname $(objpfx)testroot.pristine$$dso` ;\ $(test-wrapper) cp $$dso $(objpfx)testroot.pristine$$dso ;\ done +endif $(MAKE) install DESTDIR=$(objpfx)testroot.pristine touch $(objpfx)testroot.pristine/install.stamp |