diff options
| author | Boris Pek <tehnick-8@yandex.ru> | 2016-05-06 14:03:35 (GMT) |
|---|---|---|
| committer | Boris Pek <tehnick-8@yandex.ru> | 2016-05-16 12:45:08 (GMT) |
| commit | dce1bc264918aa09efff4ca161b0ce8c3112d66f (patch) | |
| tree | 2cff6f6f39c5a121060be196b3b7d87419b45f7c /src/nsis.mk | |
| parent | 129ef68410b0decf95c760ce40807f6b9f6f093f (diff) | |
| download | mxe-dce1bc264918aa09efff4ca161b0ce8c3112d66f.zip mxe-dce1bc264918aa09efff4ca161b0ce8c3112d66f.tar.gz mxe-dce1bc264918aa09efff4ca161b0ce8c3112d66f.tar.bz2 | |
nsis: fix build for x86_64-w64-mingw32 targets
Required for: https://github.com/mxe/mxe/pull/1165
Diffstat (limited to 'src/nsis.mk')
| -rw-r--r-- | src/nsis.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nsis.mk b/src/nsis.mk index 07c576c..5c4d34b 100644 --- a/src/nsis.mk +++ b/src/nsis.mk @@ -17,15 +17,17 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + $(if $(findstring x86_64-w64-mingw32,$(TARGET)),\ + $(SED) -i 's/pei-i386/pei-x86-64/' '$(1)/SCons/Config/linker_script') cd '$(1)' && scons \ MINGW_CROSS_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') \ SKIPUTILS='NSIS Menu' \ NSIS_MAX_STRLEN=8192 \ install $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/bin/makensis' '$(PREFIX)/bin/$(TARGET)-makensis' endef - -$(PKG)_BUILD_x86_64-w64-mingw32 = |