From e183a12d70055e66ba71352a68286af3fe45846b Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 21 Apr 2019 17:07:37 +1000
Subject: [PATCH] nsis: disable ccache

---
 src/nsis.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/nsis.mk b/src/nsis.mk
index 99a5e370..0d1c0ea3 100644
--- a/src/nsis.mk
+++ b/src/nsis.mk
@@ -25,7 +25,9 @@ define $(PKG)_BUILD
     $(if $(findstring x86_64-w64-mingw32,$(TARGET)),\
         $(SED) -i 's/pei-i386/pei-x86-64/' '$(1)/SCons/Config/linker_script' && \
         $(SED) -i 's/m_target_type=TARGET_X86ANSI/m_target_type=TARGET_AMD64/' '$(SOURCE_DIR)/Source/build.cpp')
-    cd '$(SOURCE_DIR)' && $(PYTHON2) '$(BUILD_DIR).scons/scons.py' \
+
+    # scons does various PATH manipulations that don't play well with ccache
+    cd '$(SOURCE_DIR)' && PATH='$(PREFIX)/bin:$(PATH)' $(PYTHON2) '$(BUILD_DIR).scons/scons.py' \
         XGCC_W32_PREFIX='$(TARGET)-' \
         PREFIX='$(PREFIX)/$(TARGET)' \
         `[ -d /usr/local/include ] && echo APPEND_CPPPATH=/usr/local/include` \