diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-05-24 01:20:13 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-05-24 01:20:13 +0400 |
| commit | 735559f0da66a88d366eaef1d5c91c8285a58815 (patch) | |
| tree | 7c44d17a8827e9b77d8ef06df0ca550182537bab /tools | |
| parent | a97904cbccffa8f138337c243e59ee8f9ffa8cba (diff) | |
Fixes for cross-compilation:
- Set env['CC'] and env['CXX'] as default values for
CC and CXX variables. This fixes problem with overwriting
auto-guessed compilators when reading config files
- Added new prefix for mingw tools
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/btools.py | 6 | ||||
| -rw-r--r-- | tools/crossmingw.py | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/btools.py b/tools/btools.py index 271fccff50c..e76ada3a985 100644 --- a/tools/btools.py +++ b/tools/btools.py @@ -160,7 +160,7 @@ def SetupSpawn( env ): env['SPAWN'] = buf.ourspawn -def read_opts(cfg, args): +def read_opts(env, cfg, args): localopts = Variables.Variables(cfg, args) localopts.AddVariables( ('LCGDIR', 'location of cvs lib dir'), @@ -400,8 +400,8 @@ def read_opts(cfg, args): ('BF_BUILDDIR', 'Build dir', ''), ('BF_INSTALLDIR', 'Installation dir', ''), - ('CC', 'C compiler to use', ''), - ('CXX', 'C++ compiler to use', ''), + ('CC', 'C compiler to use', env['CC']), + ('CXX', 'C++ compiler to use', env['CXX']), (BoolVariable('BF_BUILDINFO', 'Buildtime in splash if true', True)), diff --git a/tools/crossmingw.py b/tools/crossmingw.py index ba6d4878593..f97fdf3c15e 100644 --- a/tools/crossmingw.py +++ b/tools/crossmingw.py @@ -50,6 +50,7 @@ prefixes = SCons.Util.Split(""" i486-mingw32msvc- i586-mingw32msvc- i686-mingw32msvc- + i686-pc-mingw32- """) def find(env): |