Makefile: Include C++ headers in the cross-tools bundle.

[distorted-chroot] / Makefile

diff --git a/Makefile b/Makefile
index 07f2d3c..4b4a616 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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)
@@ -274,7 +279,8 @@ throwrc                      = { $1; echo $$? >&4; }
 ##     $(call squote,TXT)
 ##
 ## Single-quote TXT.
-squote                  = '$(subst ','\\'',$1)'
+squote                  = '$(subst ','\'',$1)'
+#'
 
 ##     $(call chroot-dist,D-A) -> D
 ##     $(call chroot-arch,D-A) -> A
@@ -603,7 +609,8 @@ $(foreach d,$(LOCAL_COMMON_DIRS) $(LOCAL_EXTRA_DIRS),$(LOCAL)/$d):
        $(V_AT)mkdir -p $(dir $(patsubst %/,%,$@))
        $(call v_tag,MKDIR)mkdir $@
 
-LOCAL_ARCH_DIRS                 = bin/ etc/ games/ include/ lib/ libexec/ sbin/
+LOCAL_ARCH_DIRS                 = bin/ etc/ games/ include/ include.aside/
+LOCAL_ARCH_DIRS                += lib/ libexec/ sbin/
 LOCAL_ARCH_LINKS        = man
 man_LINKDEST            = share/man
 all:: $(foreach a,$(ALL_ARCHS),\
@@ -633,12 +640,12 @@ $(foreach a,$(ALL_ARCHS),\
 ### Main chroot maintenance.
 
 OPTS                    =
-FRESH                   = create
+FRESH                   = 1w
 JOBS                    = chroot cross-tools pkg-build
 
 MAINTQ_                         = -q
 MAINTQ_0                = -q
-MAINT                   = +$(call v_tag,RUN)\
+MAINT                   = +$(call v_tag,MAINT)\
        PYTHONPATH=$(STATE)/lib/python $(STATE)/bin/chroot-maint \
                $(MAINTQ_$V) $(OPTS)
 
@@ -647,6 +654,19 @@ maint: all check
 .PHONY: maint
 
 ###--------------------------------------------------------------------------
+### Running random commands.
+
+CMD                     = echo %d %a
+subst-command           = $(subst %d,$(call chroot-dist,$1), \
+                               $(subst %a,$(call chroot-arch,$1), \
+                                       $(subst %r,$1, $(CMD))))
+
+run: $(foreach c,$(ALL_CHROOTS),run/$c)
+$(foreach c,$(ALL_CHROOTS),run/$c): run/%:
+       $(V_AT)$(call v_print,RUN,$(call subst-command,$*))\
+               $(call subst-command,$*)
+
+###--------------------------------------------------------------------------
 ### Other maintenance targets.
 
 show:; : $x