X-Git-Url: https://git.distorted.org.uk/~mdw/distorted-chroot/blobdiff_plain/942fed180961536fa966bfd4db28ee0537755932..HEAD:/Makefile

diff --git a/Makefile b/Makefile
index 3b431a2..fb888c0 100644
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,7 @@ CROSS_PATHS		+= \
 		sha256sum sha384sum sha512sum shred shuf sort split stat \
 		stdbuf sum tac tail tee test timeout tr truncate tsort tty \
 		unexpand uniq unlink users wc who whoami yes) \
-	/usr/lib/MULTI/coreutils/ \
+	?/usr/lib/MULTI/coreutils/ \
 	$(addprefix /lib/MULTI/, \
 		libnsl.so.* libnss_*.so.*) \
 	/usr/bin/gpgv \
@@ -155,7 +155,8 @@ CROSS_PATHS		+= \
 		$(addprefix /usr/bin/$a-, \
 			cpp gcc g++ gcov gcov-dump gcov-tool gprof \
 			gcc-ar gcc-nm gcc-ranlib) \
-		/usr/lib/gcc-cross/$a/)
+		/usr/lib/gcc-cross/$a/ \
+		/usr/$a/include/c++)
 
 ## Local packages to be compiled and installed in chroots.  Archives can be
 ## found in `pkg/'.
@@ -178,6 +179,10 @@ arm64_QEMUHOST		 = $(64BIT_QEMUHOST)
 i386_QEMUHOST		 = $(32BIT_QEMUHOST)
 amd64_QEMUHOST		 = $(64BIT_QEMUHOST)
 
+## Which distribution of Qemu to use.
+CONFIG_VARS		+= $(foreach d,$(DISTS),$d_QEMUDIST)
+stretch_QEMUDIST	 = buster
+
 ## Qemu architecture names.  These tell us which Qemu binary to use for a
 ## particular Debian architecture.
 CONFIG_VARS		+= $(foreach a,$(FOREIGN_ARCHS),$a_QEMUARCH)