diff options
author | Curtis Dunham <Curtis.Dunham@arm.com> | 2014-05-09 18:58:46 -0400 |
---|---|---|
committer | Curtis Dunham <Curtis.Dunham@arm.com> | 2014-05-09 18:58:46 -0400 |
commit | ad019c5c58ac8983f53be2cdf87e7a81f260a5ef (patch) | |
tree | 115769cb4636a317102c23f62130024af6c52982 /SConstruct | |
parent | ecf774bc561f139a13539d40dde075710f89183c (diff) | |
download | gem5-ad019c5c58ac8983f53be2cdf87e7a81f260a5ef.tar.xz |
scons: Require SWIG >= 2.0.4 and remove vector typemaps
SWIG commit fd666c1 (*) made it unnecessary for gem5 to have these
typemaps to handle Vector types.
* https://github.com/swig/swig/commit/fd666c1440628a847793bbe1333c27dfa2f757f0
Diffstat (limited to 'SConstruct')
-rwxr-xr-x | SConstruct | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/SConstruct b/SConstruct index a1aad32d4..4df529b83 100755 --- a/SConstruct +++ b/SConstruct @@ -726,23 +726,12 @@ if len(swig_version) < 3 or \ print 'Error determining SWIG version.' Exit(1) -min_swig_version = '1.3.34' +min_swig_version = '2.0.4' if compareVersions(swig_version[2], min_swig_version) < 0: print 'Error: SWIG version', min_swig_version, 'or newer required.' print ' Installed version:', swig_version[2] Exit(1) -# Older versions of swig do not play well with more recent versions of -# gcc due to assumptions on implicit includes (cstddef) and use of -# namespaces -if main['GCC'] and compareVersions(gcc_version, '4.6') > 0 and \ - compareVersions(swig_version[2], '2') < 0: - print '\n' + termcap.Yellow + termcap.Bold + \ - 'Warning: SWIG 1.x cause issues with gcc 4.6 and later.\n' + \ - termcap.Normal + \ - 'Use SWIG 2.x to avoid assumptions on implicit includes\n' + \ - 'and use of namespaces\n' - # Set up SWIG flags & scanner swig_flags=Split('-c++ -python -modern -templatereduce $_CPPINCFLAGS') main.Append(SWIGFLAGS=swig_flags) |