diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | scripts/build-many-glibcs.py | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 3321914afc..14e71d525a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2018-01-29 Joseph Myers <joseph@codesourcery.com> + * scripts/build-many-glibcs.py (Config.build_gcc): Use + --disable-libcilkrts unconditionally, not just for the final GCC + build for Hurd. + * scripts/build-many-glibcs.py (Context.checkout): Default Linux version to 4.15. diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py index dad51a5bee..0c2ea85b5f 100755 --- a/scripts/build-many-glibcs.py +++ b/scripts/build-many-glibcs.py @@ -1311,8 +1311,12 @@ class Config(object): # libsanitizer commonly breaks because of glibc header # changes, or on unusual targets. libssp is of little # relevance with glibc's own stack checking support. + # libcilkrts does not support GNU/Hurd (and has been removed + # in GCC 8, so --disable-libcilkrts can be removed once glibc + # no longer supports building with older GCC versions). cfg_opts = list(self.gcc_cfg) - cfg_opts += ['--disable-libsanitizer', '--disable-libssp'] + cfg_opts += ['--disable-libsanitizer', '--disable-libssp', + '--disable-libcilkrts'] host_libs = self.ctx.host_libraries_installdir cfg_opts += ['--with-gmp=%s' % host_libs, '--with-mpfr=%s' % host_libs, @@ -1343,8 +1347,6 @@ class Config(object): tool_build = 'gcc' cfg_opts += ['--enable-languages=c,c++', '--enable-shared', '--enable-threads'] - if self.os == 'gnu': - cfg_opts += ['--disable-libcilkrts'] self.build_cross_tool(cmdlist, 'gcc', tool_build, cfg_opts) |