Mercurial > mxe-octave
view src/nsis-1-explicit-mingw-cross-prefix.patch @ 2661:3567da505594
json-c update to version 0.10, using github downloads.
Squashed commit of the following:
commit a93e1e80e4a6b668009bd024923e387f71eff7a3
Author: Thomas Mayer <thomas@residuum.org>
Date: Tue Jul 17 23:16:59 2012 +0200
Patches for:
- missing file
- remove check for rpl_* functions
commit ad94ec0c30381acb9ac25db96182a1308b9fbd3c
Author: Thomas Mayer <thomas@residuum.org>
Date: Tue Jul 17 19:08:40 2012 +0200
Fixed indentation
commit 78b51e08e5174454495b8df547c4bccdc06bef73
Author: Thomas Mayer <thomas@residuum.org>
Date: Tue Jul 17 01:13:08 2012 +0200
json-c compiles correctly (finally).
commit 0c4bb3a6b4b6db1ac6a6d098ce55041db55bc8ab
Author: Thomas Mayer <thomas@residuum.org>
Date: Fri Jul 13 22:16:41 2012 +0200
Changes to json-c files according to current MXE standards.
commit a533fe5439d56de76c2d3b9d634c597cba94ff52
Author: Thomas Mayer <thomas@residuum.org>
Date: Thu Jul 12 22:27:54 2012 +0200
Update to json-c 0.10, and use github repository.
author | Thomas Mayer <thomas@residuum.org> |
---|---|
date | Tue, 17 Jul 2012 23:18:18 +0200 |
parents | 99516e73b368 |
children |
line wrap: on
line source
This file is part of MXE. See index.html for further information. This patch has been taken from: http://sourceforge.net/tracker/index.php?func=detail&aid=3305366&group_id=22049&atid=373085 --- a/SCons/Tools/crossmingw.py +++ b/SCons/Tools/crossmingw.py @@ -61,6 +61,9 @@ prefixes = SCons.Util.Split(""" """) def find(env): + if env.has_key('MINGW_CROSS_PREFIX'): + return env['MINGW_CROSS_PREFIX'] + for prefix in prefixes: # First search in the SCons path and then the OS path: if env.WhereIs(prefix + 'gcc') or SCons.Util.WhereIs(prefix + 'gcc'): diff --git a/SConstruct b/SConstruct index 80872bc..4f113dd 100755 --- a/SConstruct +++ b/SConstruct @@ -59,6 +59,7 @@ doc = [ path = ARGUMENTS.get('PATH', '') toolset = ARGUMENTS.get('TOOLSET', '') +mingw_cross_prefix = ARGUMENTS.get('MINGW_CROSS_PREFIX', '') if toolset and path: defenv = Environment(ENV = {'PATH' : path}, TOOLS = toolset.split(',') + ['zip']) @@ -69,6 +70,8 @@ else: defenv = Environment(TOOLS = toolset.split(',') + ['zip']) if not toolset and not path: defenv = Environment() +if mingw_cross_prefix: + defenv['MINGW_CROSS_PREFIX'] = mingw_cross_prefix Export('defenv')