Mercurial > mxe-octave
view src/nsis-1-explicit-mingw-cross-prefix.patch @ 2776:b9a932882282
Merge pull request #83 from mabrand/stable-fix-gnutls
package gnutls: automake 1.12 compatibility
author | Volker Grabsch <vog@notjusthosting.com> |
---|---|
date | Fri, 21 Sep 2012 09:41:26 -0700 |
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')