[rtems-source-builder commit] sb: Change Cygwin support to produce cygwin executables.
Chris Johns
chrisj at rtems.org
Tue Mar 17 21:54:54 UTC 2015
Module: rtems-source-builder
Branch: master
Commit: b6d6a11abfb2e7e496b4a854d1cde7e6ead1c1d0
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=b6d6a11abfb2e7e496b4a854d1cde7e6ead1c1d0
Author: Chris Johns <chrisj at rtems.org>
Date: Wed Mar 18 08:54:48 2015 +1100
sb: Change Cygwin support to produce cygwin executables.
---
source-builder/sb/windows.py | 15 ++++++---------
1 file 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']
More information about the vc
mailing list