aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTulio Magno Quites Machado Filho <tuliom@linux.ibm.com>2019-07-22 17:34:13 -0300
committerH.J. Lu <hjl.tools@gmail.com>2022-01-27 07:28:12 -0800
commitedceb7f52045931035018fa89824fd5d7a8c875c (patch)
tree0316c753984fe4362d5641a5f91e30d99eec0b2a
parent2c9083f93ded1b9754d0ad302a05e0c5c1a57dbc (diff)
downloadglibc-edceb7f52045931035018fa89824fd5d7a8c875c.zip
glibc-edceb7f52045931035018fa89824fd5d7a8c875c.tar.gz
glibc-edceb7f52045931035018fa89824fd5d7a8c875c.tar.bz2
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> (cherry picked from commit 35e038c1d2ccb3a75395662f9c4f28d85a61444f)
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4a014d6..723aa0e 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))