1 files changed, 17 insertions, 13 deletions
diff --git a/src/nsis.mk b/src/nsis.mk
index 0d1c0ea..b8667c4 100644
--- a/src/nsis.mk
+++ b/src/nsis.mk
@@ -4,8 +4,8 @@ PKG             := nsis
 $(PKG)_WEBSITE  := https://nsis.sourceforge.io/
 $(PKG)_DESCR    := NSIS
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.04
-$(PKG)_CHECKSUM := 609536046c50f35cfd909dd7df2ab38f2e835d0da3c1048aa0d48c59c5a4f4f5
+$(PKG)_VERSION  := 3.05
+$(PKG)_CHECKSUM := b6e1b309ab907086c6797618ab2879cb95387ec144dab36656b0b5fb77e97ce9
 $(PKG)_SUBDIR   := nsis-$($(PKG)_VERSION)-src
 $(PKG)_FILE     := nsis-$($(PKG)_VERSION)-src.tar.bz2
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/nsis/NSIS 3/$($(PKG)_VERSION)/$($(PKG)_FILE)
@@ -17,6 +17,17 @@ define $(PKG)_UPDATE
     tail -1
 endef
 
+define $(PKG)_SCONS_OPTS
+    XGCC_W32_PREFIX='$(TARGET)-' \
+    PREFIX='$(PREFIX)/$(TARGET)' \
+    `[ -d /usr/local/include ] && echo APPEND_CPPPATH=/usr/local/include` \
+    `[ -d /usr/local/lib ]     && echo APPEND_LIBPATH=/usr/local/lib` \
+    $(if $(findstring x86_64-w64-mingw32,$(TARGET)),\
+        SKIPPLUGINS='System' TARGET_ARCH=amd64) \
+    SKIPUTILS='MakeLangId,Makensisw,NSIS Menu,zip2exe' \
+    NSIS_MAX_STRLEN=8192
+endef
+
 define $(PKG)_BUILD
     # scons supports -j option but nsis parallel build fails
     # nsis uses it's own BUILD_PREFIX which isn't user configurable
@@ -26,16 +37,9 @@ define $(PKG)_BUILD
         $(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')
 
-    # 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` \
-        `[ -d /usr/local/lib ]     && echo APPEND_LIBPATH=/usr/local/lib` \
-        $(if $(findstring x86_64-w64-mingw32,$(TARGET)),\
-            SKIPPLUGINS='System' TARGET_ARCH=amd64) \
-        SKIPUTILS='MakeLangId,Makensisw,NSIS Menu,zip2exe' \
-        NSIS_MAX_STRLEN=8192 \
-        install
+    cd '$(SOURCE_DIR)' && $(SCONS_LOCAL) $($(PKG)_SCONS_OPTS) -j '$(JOBS)' -k || \
+    cd '$(SOURCE_DIR)' && $(SCONS_LOCAL) $($(PKG)_SCONS_OPTS) -j '$(JOBS)'
+    cd '$(SOURCE_DIR)' && $(SCONS_LOCAL) $($(PKG)_SCONS_OPTS) -j 1 install
+
     $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/bin/makensis' '$(PREFIX)/bin/$(TARGET)-makensis'
 endef