Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2018-07-13 15:20:36 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2018-09-26 14:05:36 (GMT) |
| commit | 1536284a15743f6ec41d3230177a24d245158a9d (patch) | |
| tree | 21216d18d93ddfc620e6b36dc28428c5d5b71775 /scons | |
| parent | 091f6e520694360a0407ab0cf3bb036fb461e6e3 (diff) | |
| download | swift-1536284a15743f6ec41d3230177a24d245158a9d.zip swift-1536284a15743f6ec41d3230177a24d245158a9d.tar.bz2 | |
Update SCons in 3rdParty from 2.4.0 to 3.0.1
This also has our scons patch in 3rdParty/SCons applied.
Test-Information:
Builds with unit tests on macOS 10.13.6.
Change-Id: I25d3662eeec27a76dab10d501ba46dc16f0bef4b
Diffstat (limited to 'scons')
| -rwxr-xr-x | scons | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -7,17 +7,17 @@ function is_supported_python { local exe=$1 - $exe -c 'import sys; (major, minor, a, b, c) = sys.version_info; python_version = (major, minor); exit(not ((2, 4) <= python_version <= (2, 7)))' 2>/dev/null + $exe -c 'import sys; (major, minor, a, b, c) = sys.version_info; python_version = (major, minor); exit(not (((2, 7) <= python_version) or ((3, 5) <= python_version)))' 2>/dev/null } declare -a supported_python_versions=(python python2.7 python2.6 python2.5 python2.4) for exe in ${supported_python_versions[*]}; do if is_supported_python "$exe"; then - exec $exe `dirname $0`/3rdParty/SCons/scons-2.4.0/script/scons "$@" + exec $exe `dirname $0`/3rdParty/SCons/scons-3.0.1/script/scons.py "$@" exit fi done -echo "No suitable Python interpreter found! Swift build system supports Python 2.4 to Python 2.7.!!!" >&2 +echo "No suitable Python interpreter found! Swift build system supports Python 2.7.* and Python 3.5 or higher!" >&2 exit 1
\ No newline at end of file |