diff options
| author | Chris Johns <chrisj@rtems.org> | 2015-03-18 08:54:48 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2015-03-18 08:54:48 +1100 |
| commit | b6d6a11abfb2e7e496b4a854d1cde7e6ead1c1d0 (patch) | |
| tree | d21017499202521719110ca2f900610d4aece1ab | |
| parent | Add merge to the git and download modules to merge after a fetch. (diff) | |
| download | rtems-source-builder-b6d6a11abfb2e7e496b4a854d1cde7e6ead1c1d0.tar.bz2 | |
sb: Change Cygwin support to produce cygwin executables.
| -rw-r--r-- | source-builder/sb/windows.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/source-builder/sb/windows.py b/source-builder/sb/windows.py index 835101f..96ed1ac 100644 --- a/source-builder/sb/windows.py +++ b/source-builder/sb/windows.py @@ -40,8 +40,6 @@ def load(): else: hosttype = 'x86_64' machsize = '32' - host_triple = '%s-w%s-mingw32' % (hosttype, machsize) - build_triple = '%s-w%s-mingw32' % (hosttype, machsize) # See if this is actually Cygwin Python if os.name == 'posix': @@ -50,17 +48,16 @@ def load(): hosttype = uname[4] uname = uname[0] if uname.startswith('CYGWIN'): - if uname.endswith('WOW64'): - uname = 'cygwin' - build_triple = hosttype + '-pc-' + uname - hosttype = 'x86_64' - host_triple = hosttype + '-w64-' + system - else: - raise error.general('invalid uname for Windows') + uname = 'cygwin' + host_triple = hosttype + '-pc-' + uname + build_triple = hosttype + '-pc-' + uname else: raise error.general('invalid POSIX python') except: pass + else: + host_triple = '%s-w%s-mingw32' % (hosttype, machsize) + build_triple = '%s-w%s-mingw32' % (hosttype, machsize) if os.environ.has_key('NUMBER_OF_PROCESSORS'): ncpus = os.environ['NUMBER_OF_PROCESSORS'] |