diff options
| author | Tony Theodore <tonyt@logyst.com> | 2018-08-18 05:00:17 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2018-08-18 05:00:17 (GMT) |
| commit | 13d6257891f94d539b29a786641cef60b0874233 (patch) | |
| tree | 74f3b93823cada1e507ce7656e2c5fac77f2c072 /src | |
| parent | eb9093a37215f529a737b5fac3eec4b3b5e8f757 (diff) | |
| download | mxe-13d6257891f94d539b29a786641cef60b0874233.zip mxe-13d6257891f94d539b29a786641cef60b0874233.tar.gz mxe-13d6257891f94d539b29a786641cef60b0874233.tar.bz2 | |
nsis: remove obsolete patch and MINGW_CROSS_PREFIX variable
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsis-1-fixes.patch | 47 | ||||
| -rw-r--r-- | src/nsis.mk | 1 |
2 files changed, 0 insertions, 48 deletions
diff --git a/src/nsis-1-fixes.patch b/src/nsis-1-fixes.patch deleted file mode 100644 index cc7c596..0000000 --- a/src/nsis-1-fixes.patch +++ /dev/null @@ -1,47 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -Contains ad hoc patches for cross building. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sun, 12 Aug 2012 12:33:26 +0200 -Subject: [PATCH 1/1] explicit mingw cross prefix - -This patch has been taken from: -http://sourceforge.net/tracker/index.php?func=detail&aid=3305366&group_id=22049&atid=373085 - -diff --git a/SCons/Tools/crossmingw.py b/SCons/Tools/crossmingw.py -index 1111111..2222222 100755 ---- a/SCons/Tools/crossmingw.py -+++ b/SCons/Tools/crossmingw.py -@@ -65,6 +65,9 @@ prefixes = SCons.Util.Split(""" - """) - - def find(env): -+ if env.has_key('MINGW_CROSS_PREFIX'): -+ return env['MINGW_CROSS_PREFIX'] -+ - # Explicitly specified toolchain to build Windows executables - # takes predominance. - prefix = SCons.Script.ARGUMENTS.get('XGCC_W32_PREFIX', None) -diff --git a/SConstruct b/SConstruct -index 1111111..2222222 100755 ---- a/SConstruct -+++ b/SConstruct -@@ -67,6 +67,7 @@ doctypes = [ - path = ARGUMENTS.get('PATH', '') - toolset = ARGUMENTS.get('TOOLSET', '') - arch = ARGUMENTS.get('TARGET_ARCH', 'x86') -+mingw_cross_prefix = ARGUMENTS.get('MINGW_CROSS_PREFIX', '') - - if toolset and path: - defenv = Environment(TARGET_ARCH = arch, ENV = {'PATH' : path}, TOOLS = toolset.split(',') + ['zip']) -@@ -77,6 +78,8 @@ else: - defenv = Environment(TARGET_ARCH = arch, TOOLS = toolset.split(',') + ['zip']) - if not toolset and not path: - defenv = Environment(TARGET_ARCH = arch) -+if mingw_cross_prefix: -+ defenv['MINGW_CROSS_PREFIX'] = mingw_cross_prefix - - Export('defenv') - diff --git a/src/nsis.mk b/src/nsis.mk index ca73266..8a96aec 100644 --- a/src/nsis.mk +++ b/src/nsis.mk @@ -22,7 +22,6 @@ 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/' '$(1)/Source/build.cpp') cd '$(1)' && scons \ - MINGW_CROSS_PREFIX='$(TARGET)-' \ XGCC_W32_PREFIX='$(TARGET)-' \ PREFIX='$(PREFIX)/$(TARGET)' \ `[ -d /usr/local/include ] && echo APPEND_CPPPATH=/usr/local/include` \ |