aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTulio Magno Quites Machado Filho <tuliom@linux.ibm.com>2019-07-22 17:34:13 -0300
committerTulio Magno Quites Machado Filho <tuliom@linux.ibm.com>2019-07-23 10:14:26 -0300
commit35e038c1d2ccb3a75395662f9c4f28d85a61444f (patch)
tree2d896531648d33aa7078f90bf15f84979f2e1e9d /Makefile
parenttest-container: Avoid copying unintended system libraries (diff)
downloadglibc-35e038c1d2ccb3a75395662f9c4f28d85a61444f.tar.gz
glibc-35e038c1d2ccb3a75395662f9c4f28d85a61444f.tar.bz2
glibc-35e038c1d2ccb3a75395662f9c4f28d85a61444f.zip
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 <dj@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a4ed747cef..9fbf705200 100644
--- a/Makefile
+++ b/Makefile
@@ -401,7 +401,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))