From: Tulio Magno Quites Machado Filho Date: Mon, 22 Jul 2019 20:34:13 +0000 (-0300) Subject: test-container: Install with $(all-subdirs) [BZ #24794] X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=edceb7f52045931035018fa89824fd5d7a8c875c;p=thirdparty%2Fglibc.git test-container: Install with $(all-subdirs) [BZ #24794] Whenever a sub-make is created, it inherits the variable subdirs from its parent. This is also true when make check is called with a restricted list of subdirs. In this scenario, make install is executed "partially" and testroot.pristine ends up with an incomplete installation. [BZ #24794] * Makefile (testroot.pristine/install.stamp): Pass subdirs='$(all-subdirs)' to make install. Reviewed-by: DJ Delorie (cherry picked from commit 35e038c1d2ccb3a75395662f9c4f28d85a61444f) --- diff --git a/Makefile b/Makefile index 4a014d6effd..723aa0e456c 100644 --- a/Makefile +++ b/Makefile @@ -395,7 +395,8 @@ ifeq ($(run-built-tests),yes) $(test-wrapper) cp $$dso $(objpfx)testroot.pristine$$dso ;\ done endif - $(MAKE) install DESTDIR=$(objpfx)testroot.pristine + $(MAKE) install DESTDIR=$(objpfx)testroot.pristine \ + subdirs='$(all-subdirs)' touch $(objpfx)testroot.pristine/install.stamp tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))