Paths to commands such as $MAKE and $NINJA are now exposed in the
container's environment, and the symlinks necessary to make ccache
work transparently are also included.

The corresponding libvirt-jenkins-ci commit is 2563aebb6c5c.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
Pushed under the Dockerfile update rule.
Plain text diff included for your convenience.

 buildenv-libosinfo-centos-7.zip               | Bin 1665 -> 1782 bytes
 buildenv-libosinfo-centos-8.zip               | Bin 594 -> 716 bytes
 buildenv-libosinfo-debian-10.zip              | Bin 663 -> 783 bytes
 buildenv-libosinfo-debian-9.zip               | Bin 683 -> 804 bytes
 buildenv-libosinfo-debian-sid.zip             | Bin 663 -> 783 bytes
 ...denv-libosinfo-fedora-30-cross-mingw32.zip | Bin 629 -> 754 bytes
 ...denv-libosinfo-fedora-30-cross-mingw64.zip | Bin 631 -> 757 bytes
 buildenv-libosinfo-fedora-30.zip              | Bin 544 -> 668 bytes
 buildenv-libosinfo-fedora-31.zip              | Bin 544 -> 668 bytes
 buildenv-libosinfo-fedora-rawhide.zip         | Bin 564 -> 688 bytes
 buildenv-libosinfo-opensuse-151.zip           | Bin 570 -> 694 bytes
 buildenv-libosinfo-ubuntu-1604.zip            | Bin 686 -> 808 bytes
 buildenv-libosinfo-ubuntu-1804.zip            | Bin 686 -> 808 bytes
 buildenv-libvirt-centos-7.zip                 | Bin 1888 -> 2006 bytes
 buildenv-libvirt-centos-8.zip                 | Bin 802 -> 928 bytes
 buildenv-libvirt-debian-10-cross-aarch64.zip  | Bin 982 -> 1110 bytes
 buildenv-libvirt-debian-10-cross-armv6l.zip   | Bin 974 -> 1102 bytes
 buildenv-libvirt-debian-10-cross-armv7l.zip   | Bin 983 -> 1108 bytes
 buildenv-libvirt-debian-10-cross-i686.zip     | Bin 981 -> 1105 bytes
 buildenv-libvirt-debian-10-cross-mips.zip     | Bin 974 -> 1103 bytes
 buildenv-libvirt-debian-10-cross-mips64el.zip | Bin 985 -> 1114 bytes
 buildenv-libvirt-debian-10-cross-mipsel.zip   | Bin 982 -> 1105 bytes
 buildenv-libvirt-debian-10-cross-ppc64le.zip  | Bin 985 -> 1115 bytes
 buildenv-libvirt-debian-10-cross-s390x.zip    | Bin 977 -> 1105 bytes
 buildenv-libvirt-debian-10.zip                | Bin 908 -> 1032 bytes
 buildenv-libvirt-debian-9-cross-aarch64.zip   | Bin 1018 -> 1143 bytes
 buildenv-libvirt-debian-9-cross-armv6l.zip    | Bin 1009 -> 1134 bytes
 buildenv-libvirt-debian-9-cross-armv7l.zip    | Bin 1014 -> 1140 bytes
 buildenv-libvirt-debian-9-cross-mips.zip      | Bin 1010 -> 1134 bytes
 buildenv-libvirt-debian-9-cross-mips64el.zip  | Bin 1021 -> 1145 bytes
 buildenv-libvirt-debian-9-cross-mipsel.zip    | Bin 1014 -> 1137 bytes
 buildenv-libvirt-debian-9-cross-ppc64le.zip   | Bin 1017 -> 1147 bytes
 buildenv-libvirt-debian-9-cross-s390x.zip     | Bin 1013 -> 1137 bytes
 buildenv-libvirt-debian-9.zip                 | Bin 938 -> 1063 bytes
 buildenv-libvirt-debian-sid-cross-aarch64.zip | Bin 986 -> 1110 bytes
 buildenv-libvirt-debian-sid-cross-armv6l.zip  | Bin 978 -> 1102 bytes
 buildenv-libvirt-debian-sid-cross-armv7l.zip  | Bin 982 -> 1108 bytes
 buildenv-libvirt-debian-sid-cross-i686.zip    | Bin 981 -> 1104 bytes
 ...denv-libvirt-debian-sid-cross-mips64el.zip | Bin 985 -> 1114 bytes
 buildenv-libvirt-debian-sid-cross-mipsel.zip  | Bin 974 -> 1102 bytes
 buildenv-libvirt-debian-sid-cross-ppc64le.zip | Bin 986 -> 1115 bytes
 buildenv-libvirt-debian-sid-cross-s390x.zip   | Bin 977 -> 1105 bytes
 buildenv-libvirt-debian-sid.zip               | Bin 908 -> 1032 bytes
 buildenv-libvirt-fedora-30-cross-mingw32.zip  | Bin 897 -> 1031 bytes
 buildenv-libvirt-fedora-30-cross-mingw64.zip  | Bin 899 -> 1034 bytes
 buildenv-libvirt-fedora-30.zip                | Bin 776 -> 904 bytes
 buildenv-libvirt-fedora-31.zip                | Bin 776 -> 904 bytes
 buildenv-libvirt-fedora-rawhide.zip           | Bin 796 -> 925 bytes
 buildenv-libvirt-opensuse-151.zip             | Bin 785 -> 914 bytes
 buildenv-libvirt-ubuntu-1604.zip              | Bin 942 -> 1069 bytes
 buildenv-libvirt-ubuntu-1804.zip              | Bin 943 -> 1069 bytes
 51 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/buildenv-libosinfo-centos-7.zip b/buildenv-libosinfo-centos-7.zip
index e4f5b87..185f258 100644
--- a/buildenv-libosinfo-centos-7.zip
+++ b/buildenv-libosinfo-centos-7.zip
@@ -80,9 +80,18 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
         vala \
         vim && \
     yum autoremove -y && \
-    yum clean all -y
+    yum clean all -y && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
          meson==0.49.0
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja-build"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libosinfo-centos-8.zip b/buildenv-libosinfo-centos-8.zip
index 53a49d0..ce7c071 100644
--- a/buildenv-libosinfo-centos-8.zip
+++ b/buildenv-libosinfo-centos-8.zip
@@ -52,6 +52,15 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
         vala \
         vim && \
     dnf autoremove -y && \
-    dnf clean all -y
+    dnf clean all -y && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libosinfo-debian-10.zip b/buildenv-libosinfo-debian-10.zip
index 2592910..c97187e 100644
--- a/buildenv-libosinfo-debian-10.zip
+++ b/buildenv-libosinfo-debian-10.zip
@@ -53,6 +53,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libosinfo-debian-9.zip b/buildenv-libosinfo-debian-9.zip
index 72b04a2..16243b9 100644
--- a/buildenv-libosinfo-debian-9.zip
+++ b/buildenv-libosinfo-debian-9.zip
@@ -53,9 +53,18 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
          meson==0.49.0
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libosinfo-debian-sid.zip b/buildenv-libosinfo-debian-sid.zip
index f81f758..ddb2598 100644
--- a/buildenv-libosinfo-debian-sid.zip
+++ b/buildenv-libosinfo-debian-sid.zip
@@ -53,6 +53,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libosinfo-fedora-30-cross-mingw32.zip b/buildenv-libosinfo-fedora-30-cross-mingw32.zip
index ff8776c..01cc808 100644
--- a/buildenv-libosinfo-fedora-30-cross-mingw32.zip
+++ b/buildenv-libosinfo-fedora-30-cross-mingw32.zip
@@ -50,7 +50,10 @@ RUN dnf update -y && \
         vala \
         vim && \
     dnf autoremove -y && \
-    dnf clean all -y
+    dnf clean all -y && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-$(basename /usr/bin/gcc)
 
 RUN dnf install -y \
         mingw32-glib2 \
@@ -64,5 +67,11 @@ RUN dnf install -y \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "i686-w64-mingw32"
 ENV CONFIGURE_OPTS "--host=i686-w64-mingw32"
diff --git a/buildenv-libosinfo-fedora-30-cross-mingw64.zip b/buildenv-libosinfo-fedora-30-cross-mingw64.zip
index 24f38bc..a67bf61 100644
--- a/buildenv-libosinfo-fedora-30-cross-mingw64.zip
+++ b/buildenv-libosinfo-fedora-30-cross-mingw64.zip
@@ -50,7 +50,10 @@ RUN dnf update -y && \
         vala \
         vim && \
     dnf autoremove -y && \
-    dnf clean all -y
+    dnf clean all -y && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-$(basename /usr/bin/gcc)
 
 RUN dnf install -y \
         mingw64-glib2 \
@@ -64,5 +67,11 @@ RUN dnf install -y \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "x86_64-w64-mingw32"
 ENV CONFIGURE_OPTS "--host=x86_64-w64-mingw32"
diff --git a/buildenv-libosinfo-fedora-30.zip b/buildenv-libosinfo-fedora-30.zip
index 69ea788..9d3773d 100644
--- a/buildenv-libosinfo-fedora-30.zip
+++ b/buildenv-libosinfo-fedora-30.zip
@@ -50,6 +50,15 @@ RUN dnf update -y && \
         vala \
         vim && \
     dnf autoremove -y && \
-    dnf clean all -y
+    dnf clean all -y && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libosinfo-fedora-31.zip b/buildenv-libosinfo-fedora-31.zip
index 4462104..22bb401 100644
--- a/buildenv-libosinfo-fedora-31.zip
+++ b/buildenv-libosinfo-fedora-31.zip
@@ -50,6 +50,15 @@ RUN dnf update -y && \
         vala \
         vim && \
     dnf autoremove -y && \
-    dnf clean all -y
+    dnf clean all -y && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libosinfo-fedora-rawhide.zip b/buildenv-libosinfo-fedora-rawhide.zip
index 6d6cefd..6ec74e8 100644
--- a/buildenv-libosinfo-fedora-rawhide.zip
+++ b/buildenv-libosinfo-fedora-rawhide.zip
@@ -51,6 +51,15 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         vala \
         vim && \
     dnf autoremove -y && \
-    dnf clean all -y
+    dnf clean all -y && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libosinfo-opensuse-151.zip b/buildenv-libosinfo-opensuse-151.zip
index 689344b..0998af6 100644
--- a/buildenv-libosinfo-opensuse-151.zip
+++ b/buildenv-libosinfo-opensuse-151.zip
@@ -49,9 +49,18 @@ RUN zypper update -y && \
            sudo \
            vala \
            vim && \
-    zypper clean --all
+    zypper clean --all && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
          meson==0.49.0
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libosinfo-ubuntu-1604.zip b/buildenv-libosinfo-ubuntu-1604.zip
index 5e3bc10..261edc5 100644
--- a/buildenv-libosinfo-ubuntu-1604.zip
+++ b/buildenv-libosinfo-ubuntu-1604.zip
@@ -53,9 +53,18 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
          meson==0.49.0
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libosinfo-ubuntu-1804.zip b/buildenv-libosinfo-ubuntu-1804.zip
index ff8df9a..0ccfade 100644
--- a/buildenv-libosinfo-ubuntu-1804.zip
+++ b/buildenv-libosinfo-ubuntu-1804.zip
@@ -53,9 +53,18 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
          meson==0.49.0
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libvirt-centos-7.zip b/buildenv-libvirt-centos-7.zip
index 96cd758..d6dc2e6 100644
--- a/buildenv-libvirt-centos-7.zip
+++ b/buildenv-libvirt-centos-7.zip
@@ -118,9 +118,18 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
         xfsprogs-devel \
         yajl-devel && \
     yum autoremove -y && \
-    yum clean all -y
+    yum clean all -y && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
          meson==0.49.0
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja-build"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libvirt-centos-8.zip b/buildenv-libvirt-centos-8.zip
index a63524b..a83cd07 100644
--- a/buildenv-libvirt-centos-8.zip
+++ b/buildenv-libvirt-centos-8.zip
@@ -91,6 +91,15 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
         xfsprogs-devel \
         yajl-devel && \
     dnf autoremove -y && \
-    dnf clean all -y
+    dnf clean all -y && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libvirt-debian-10-cross-aarch64.zip b/buildenv-libvirt-debian-10-cross-aarch64.zip
index 9bdfe9c..65c1169 100644
--- a/buildenv-libvirt-debian-10-cross-aarch64.zip
+++ b/buildenv-libvirt-debian-10-cross-aarch64.zip
@@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture arm64 && \
@@ -108,5 +111,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "aarch64-linux-gnu"
 ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu"
diff --git a/buildenv-libvirt-debian-10-cross-armv6l.zip b/buildenv-libvirt-debian-10-cross-armv6l.zip
index 84df535..0291ad7 100644
--- a/buildenv-libvirt-debian-10-cross-armv6l.zip
+++ b/buildenv-libvirt-debian-10-cross-armv6l.zip
@@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture armel && \
@@ -106,5 +109,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "arm-linux-gnueabi"
 ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi"
diff --git a/buildenv-libvirt-debian-10-cross-armv7l.zip b/buildenv-libvirt-debian-10-cross-armv7l.zip
index fa1b9ce..3a804ce 100644
--- a/buildenv-libvirt-debian-10-cross-armv7l.zip
+++ b/buildenv-libvirt-debian-10-cross-armv7l.zip
@@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture armhf && \
@@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "arm-linux-gnueabihf"
 ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf"
diff --git a/buildenv-libvirt-debian-10-cross-i686.zip b/buildenv-libvirt-debian-10-cross-i686.zip
index 22903cf..7ae41c0 100644
--- a/buildenv-libvirt-debian-10-cross-i686.zip
+++ b/buildenv-libvirt-debian-10-cross-i686.zip
@@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture i386 && \
@@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "i686-linux-gnu"
 ENV CONFIGURE_OPTS "--host=i686-linux-gnu"
diff --git a/buildenv-libvirt-debian-10-cross-mips.zip b/buildenv-libvirt-debian-10-cross-mips.zip
index 2beba75..e09c5b8 100644
--- a/buildenv-libvirt-debian-10-cross-mips.zip
+++ b/buildenv-libvirt-debian-10-cross-mips.zip
@@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture mips && \
@@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "mips-linux-gnu"
 ENV CONFIGURE_OPTS "--host=mips-linux-gnu"
diff --git a/buildenv-libvirt-debian-10-cross-mips64el.zip b/buildenv-libvirt-debian-10-cross-mips64el.zip
index c900d7a..bb4b78c 100644
--- a/buildenv-libvirt-debian-10-cross-mips64el.zip
+++ b/buildenv-libvirt-debian-10-cross-mips64el.zip
@@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture mips64el && \
@@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "mips64el-linux-gnuabi64"
 ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64"
diff --git a/buildenv-libvirt-debian-10-cross-mipsel.zip b/buildenv-libvirt-debian-10-cross-mipsel.zip
index ae436b6..3b26f2d 100644
--- a/buildenv-libvirt-debian-10-cross-mipsel.zip
+++ b/buildenv-libvirt-debian-10-cross-mipsel.zip
@@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture mipsel && \
@@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "mipsel-linux-gnu"
 ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu"
diff --git a/buildenv-libvirt-debian-10-cross-ppc64le.zip b/buildenv-libvirt-debian-10-cross-ppc64le.zip
index 475681a..ff3eabb 100644
--- a/buildenv-libvirt-debian-10-cross-ppc64le.zip
+++ b/buildenv-libvirt-debian-10-cross-ppc64le.zip
@@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture ppc64el && \
@@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "powerpc64le-linux-gnu"
 ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu"
diff --git a/buildenv-libvirt-debian-10-cross-s390x.zip b/buildenv-libvirt-debian-10-cross-s390x.zip
index 6e88d47..3a2dd96 100644
--- a/buildenv-libvirt-debian-10-cross-s390x.zip
+++ b/buildenv-libvirt-debian-10-cross-s390x.zip
@@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture s390x && \
@@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "s390x-linux-gnu"
 ENV CONFIGURE_OPTS "--host=s390x-linux-gnu"
diff --git a/buildenv-libvirt-debian-10.zip b/buildenv-libvirt-debian-10.zip
index 4b4a6e2..56022ea 100644
--- a/buildenv-libvirt-debian-10.zip
+++ b/buildenv-libvirt-debian-10.zip
@@ -97,6 +97,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libvirt-debian-9-cross-aarch64.zip b/buildenv-libvirt-debian-9-cross-aarch64.zip
index 37752fc..204b547 100644
--- a/buildenv-libvirt-debian-9-cross-aarch64.zip
+++ b/buildenv-libvirt-debian-9-cross-aarch64.zip
@@ -59,7 +59,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture arm64 && \
@@ -112,5 +115,11 @@ RUN pip3 install \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "aarch64-linux-gnu"
 ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu"
diff --git a/buildenv-libvirt-debian-9-cross-armv6l.zip b/buildenv-libvirt-debian-9-cross-armv6l.zip
index 66c50ae..97787a3 100644
--- a/buildenv-libvirt-debian-9-cross-armv6l.zip
+++ b/buildenv-libvirt-debian-9-cross-armv6l.zip
@@ -59,7 +59,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture armel && \
@@ -110,5 +113,11 @@ RUN pip3 install \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "arm-linux-gnueabi"
 ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi"
diff --git a/buildenv-libvirt-debian-9-cross-armv7l.zip b/buildenv-libvirt-debian-9-cross-armv7l.zip
index 8102db9..52f4e2f 100644
--- a/buildenv-libvirt-debian-9-cross-armv7l.zip
+++ b/buildenv-libvirt-debian-9-cross-armv7l.zip
@@ -59,7 +59,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture armhf && \
@@ -111,5 +114,11 @@ RUN pip3 install \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "arm-linux-gnueabihf"
 ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf"
diff --git a/buildenv-libvirt-debian-9-cross-mips.zip b/buildenv-libvirt-debian-9-cross-mips.zip
index 739fc5e..16f1b91 100644
--- a/buildenv-libvirt-debian-9-cross-mips.zip
+++ b/buildenv-libvirt-debian-9-cross-mips.zip
@@ -59,7 +59,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture mips && \
@@ -111,5 +114,11 @@ RUN pip3 install \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "mips-linux-gnu"
 ENV CONFIGURE_OPTS "--host=mips-linux-gnu"
diff --git a/buildenv-libvirt-debian-9-cross-mips64el.zip b/buildenv-libvirt-debian-9-cross-mips64el.zip
index 3d38e7c..8090a60 100644
--- a/buildenv-libvirt-debian-9-cross-mips64el.zip
+++ b/buildenv-libvirt-debian-9-cross-mips64el.zip
@@ -59,7 +59,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture mips64el && \
@@ -111,5 +114,11 @@ RUN pip3 install \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "mips64el-linux-gnuabi64"
 ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64"
diff --git a/buildenv-libvirt-debian-9-cross-mipsel.zip b/buildenv-libvirt-debian-9-cross-mipsel.zip
index d8af5f5..a7829ee 100644
--- a/buildenv-libvirt-debian-9-cross-mipsel.zip
+++ b/buildenv-libvirt-debian-9-cross-mipsel.zip
@@ -59,7 +59,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture mipsel && \
@@ -111,5 +114,11 @@ RUN pip3 install \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "mipsel-linux-gnu"
 ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu"
diff --git a/buildenv-libvirt-debian-9-cross-ppc64le.zip b/buildenv-libvirt-debian-9-cross-ppc64le.zip
index b53581c..8707f80 100644
--- a/buildenv-libvirt-debian-9-cross-ppc64le.zip
+++ b/buildenv-libvirt-debian-9-cross-ppc64le.zip
@@ -59,7 +59,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture ppc64el && \
@@ -111,5 +114,11 @@ RUN pip3 install \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "powerpc64le-linux-gnu"
 ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu"
diff --git a/buildenv-libvirt-debian-9-cross-s390x.zip b/buildenv-libvirt-debian-9-cross-s390x.zip
index 2c9273f..503828f 100644
--- a/buildenv-libvirt-debian-9-cross-s390x.zip
+++ b/buildenv-libvirt-debian-9-cross-s390x.zip
@@ -59,7 +59,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture s390x && \
@@ -111,5 +114,11 @@ RUN pip3 install \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "s390x-linux-gnu"
 ENV CONFIGURE_OPTS "--host=s390x-linux-gnu"
diff --git a/buildenv-libvirt-debian-9.zip b/buildenv-libvirt-debian-9.zip
index 66ca52f..b4cf4c9 100644
--- a/buildenv-libvirt-debian-9.zip
+++ b/buildenv-libvirt-debian-9.zip
@@ -98,9 +98,18 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
          meson==0.49.0
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libvirt-debian-sid-cross-aarch64.zip b/buildenv-libvirt-debian-sid-cross-aarch64.zip
index 79262a1..bb3edc2 100644
--- a/buildenv-libvirt-debian-sid-cross-aarch64.zip
+++ b/buildenv-libvirt-debian-sid-cross-aarch64.zip
@@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture arm64 && \
@@ -108,5 +111,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "aarch64-linux-gnu"
 ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu"
diff --git a/buildenv-libvirt-debian-sid-cross-armv6l.zip b/buildenv-libvirt-debian-sid-cross-armv6l.zip
index 682334f..d7ba3d1 100644
--- a/buildenv-libvirt-debian-sid-cross-armv6l.zip
+++ b/buildenv-libvirt-debian-sid-cross-armv6l.zip
@@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture armel && \
@@ -106,5 +109,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "arm-linux-gnueabi"
 ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi"
diff --git a/buildenv-libvirt-debian-sid-cross-armv7l.zip b/buildenv-libvirt-debian-sid-cross-armv7l.zip
index 529676e..532722b 100644
--- a/buildenv-libvirt-debian-sid-cross-armv7l.zip
+++ b/buildenv-libvirt-debian-sid-cross-armv7l.zip
@@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture armhf && \
@@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "arm-linux-gnueabihf"
 ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf"
diff --git a/buildenv-libvirt-debian-sid-cross-i686.zip b/buildenv-libvirt-debian-sid-cross-i686.zip
index 46abb22..1fcde39 100644
--- a/buildenv-libvirt-debian-sid-cross-i686.zip
+++ b/buildenv-libvirt-debian-sid-cross-i686.zip
@@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture i386 && \
@@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "i686-linux-gnu"
 ENV CONFIGURE_OPTS "--host=i686-linux-gnu"
diff --git a/buildenv-libvirt-debian-sid-cross-mips64el.zip b/buildenv-libvirt-debian-sid-cross-mips64el.zip
index 799c6f1..4ef667d 100644
--- a/buildenv-libvirt-debian-sid-cross-mips64el.zip
+++ b/buildenv-libvirt-debian-sid-cross-mips64el.zip
@@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture mips64el && \
@@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "mips64el-linux-gnuabi64"
 ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64"
diff --git a/buildenv-libvirt-debian-sid-cross-mipsel.zip b/buildenv-libvirt-debian-sid-cross-mipsel.zip
index 2cfbe46..15e3674 100644
--- a/buildenv-libvirt-debian-sid-cross-mipsel.zip
+++ b/buildenv-libvirt-debian-sid-cross-mipsel.zip
@@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture mipsel && \
@@ -106,5 +109,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "mipsel-linux-gnu"
 ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu"
diff --git a/buildenv-libvirt-debian-sid-cross-ppc64le.zip b/buildenv-libvirt-debian-sid-cross-ppc64le.zip
index da70b99..314d5f7 100644
--- a/buildenv-libvirt-debian-sid-cross-ppc64le.zip
+++ b/buildenv-libvirt-debian-sid-cross-ppc64le.zip
@@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture ppc64el && \
@@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "powerpc64le-linux-gnu"
 ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu"
diff --git a/buildenv-libvirt-debian-sid-cross-s390x.zip b/buildenv-libvirt-debian-sid-cross-s390x.zip
index d5b1174..a765a13 100644
--- a/buildenv-libvirt-debian-sid-cross-s390x.zip
+++ b/buildenv-libvirt-debian-sid-cross-s390x.zip
@@ -58,7 +58,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-$(basename /usr/bin/gcc)
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     dpkg --add-architecture s390x && \
@@ -107,5 +110,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "s390x-linux-gnu"
 ENV CONFIGURE_OPTS "--host=s390x-linux-gnu"
diff --git a/buildenv-libvirt-debian-sid.zip b/buildenv-libvirt-debian-sid.zip
index 46b1f52..b1daf91 100644
--- a/buildenv-libvirt-debian-sid.zip
+++ b/buildenv-libvirt-debian-sid.zip
@@ -97,6 +97,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libvirt-fedora-30-cross-mingw32.zip b/buildenv-libvirt-fedora-30-cross-mingw32.zip
index df8f7a7..ba90aa6 100644
--- a/buildenv-libvirt-fedora-30-cross-mingw32.zip
+++ b/buildenv-libvirt-fedora-30-cross-mingw32.zip
@@ -94,7 +94,10 @@ RUN dnf update -y && \
         yajl-devel \
         zfs-fuse && \
     dnf autoremove -y && \
-    dnf clean all -y
+    dnf clean all -y && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-$(basename /usr/bin/gcc)
 
 RUN dnf install -y \
         mingw32-curl \
@@ -114,5 +117,11 @@ RUN dnf install -y \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "i686-w64-mingw32"
 ENV CONFIGURE_OPTS "--host=i686-w64-mingw32"
diff --git a/buildenv-libvirt-fedora-30-cross-mingw64.zip b/buildenv-libvirt-fedora-30-cross-mingw64.zip
index d2b79b8..ade62a8 100644
--- a/buildenv-libvirt-fedora-30-cross-mingw64.zip
+++ b/buildenv-libvirt-fedora-30-cross-mingw64.zip
@@ -94,7 +94,10 @@ RUN dnf update -y && \
         yajl-devel \
         zfs-fuse && \
     dnf autoremove -y && \
-    dnf clean all -y
+    dnf clean all -y && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-$(basename /usr/bin/gcc)
 
 RUN dnf install -y \
         mingw64-curl \
@@ -114,5 +117,11 @@ RUN dnf install -y \
 
 ENV LANG "en_US.UTF-8"
 
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
+
 ENV ABI "x86_64-w64-mingw32"
 ENV CONFIGURE_OPTS "--host=x86_64-w64-mingw32"
diff --git a/buildenv-libvirt-fedora-30.zip b/buildenv-libvirt-fedora-30.zip
index ccc549e..dc31603 100644
--- a/buildenv-libvirt-fedora-30.zip
+++ b/buildenv-libvirt-fedora-30.zip
@@ -94,6 +94,15 @@ RUN dnf update -y && \
         yajl-devel \
         zfs-fuse && \
     dnf autoremove -y && \
-    dnf clean all -y
+    dnf clean all -y && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libvirt-fedora-31.zip b/buildenv-libvirt-fedora-31.zip
index 638a89f..10968af 100644
--- a/buildenv-libvirt-fedora-31.zip
+++ b/buildenv-libvirt-fedora-31.zip
@@ -94,6 +94,15 @@ RUN dnf update -y && \
         yajl-devel \
         zfs-fuse && \
     dnf autoremove -y && \
-    dnf clean all -y
+    dnf clean all -y && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libvirt-fedora-rawhide.zip b/buildenv-libvirt-fedora-rawhide.zip
index 5a53c70..cfb5ca9 100644
--- a/buildenv-libvirt-fedora-rawhide.zip
+++ b/buildenv-libvirt-fedora-rawhide.zip
@@ -95,6 +95,15 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         yajl-devel \
         zfs-fuse && \
     dnf autoremove -y && \
-    dnf clean all -y
+    dnf clean all -y && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libvirt-opensuse-151.zip b/buildenv-libvirt-opensuse-151.zip
index 1a835c5..0103270 100644
--- a/buildenv-libvirt-opensuse-151.zip
+++ b/buildenv-libvirt-opensuse-151.zip
@@ -91,9 +91,18 @@ RUN zypper update -y && \
            wireshark-devel \
            xen-devel \
            xfsprogs-devel && \
-    zypper clean --all
+    zypper clean --all && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
          meson==0.49.0
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libvirt-ubuntu-1604.zip b/buildenv-libvirt-ubuntu-1604.zip
index 0713bf8..a4910a6 100644
--- a/buildenv-libvirt-ubuntu-1604.zip
+++ b/buildenv-libvirt-ubuntu-1604.zip
@@ -99,9 +99,18 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
          meson==0.49.0
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/buildenv-libvirt-ubuntu-1804.zip b/buildenv-libvirt-ubuntu-1804.zip
index a18c97a..a52fcfb 100644
--- a/buildenv-libvirt-ubuntu-1804.zip
+++ b/buildenv-libvirt-ubuntu-1804.zip
@@ -99,9 +99,18 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
+    dpkg-reconfigure locales && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 RUN pip3 install \
          meson==0.49.0
 
 ENV LANG "en_US.UTF-8"
+
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

-- 
2.25.1