summaryrefslogtreecommitdiffstats
path: root/src/nsis.mk
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2021-01-09 03:17:06 (GMT)
committerTony Theodore <tonyt@logyst.com>2021-01-09 03:17:06 (GMT)
commite6f2bd5ace66bf88a2fa98503cf5b54eb188a2a5 (patch)
tree6834b240dda8e9d22d55f76e2f1bb1d11ef3fc40 /src/nsis.mk
parent42c16ff9b9021d9e644ed5045885299bce45ab2d (diff)
downloadmxe-e6f2bd5ace66bf88a2fa98503cf5b54eb188a2a5.zip
mxe-e6f2bd5ace66bf88a2fa98503cf5b54eb188a2a5.tar.gz
mxe-e6f2bd5ace66bf88a2fa98503cf5b54eb188a2a5.tar.bz2
scons pkgs: allow overriding pkg_SCONS_OPTS
Diffstat (limited to 'src/nsis.mk')
-rw-r--r--src/nsis.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nsis.mk b/src/nsis.mk
index 8e707c9..e6b8c53 100644
--- a/src/nsis.mk
+++ b/src/nsis.mk
@@ -17,7 +17,7 @@ define $(PKG)_UPDATE
tail -1
endef
-define $(PKG)_SCONS_OPTS
+define _$(PKG)_SCONS_OPTS
XGCC_W32_PREFIX='$(TARGET)-' \
PREFIX='$(PREFIX)/$(TARGET)' \
`[ -d /usr/local/include ] && echo APPEND_CPPPATH=/usr/local/include` \
@@ -36,9 +36,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')
- 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
+ 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'
'$(TARGET)-makensis' '$(SOURCE_DIR)/Examples/bigtest.nsi'