diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2018-01-29 13:49:21 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2018-01-29 13:49:21 +0000 |
| commit | 088de7d0091bdfac4b702ab2060289affc85d6a4 (patch) | |
| tree | 53319c82c96c1449b2a21c79a6a93dba807f3d5c | |
| parent | 522623e4aaea1da007b6fe0c7c6e880ba1c971ee (diff) | |
| download | glibc-088de7d0091bdfac4b702ab2060289affc85d6a4.tar.gz glibc-088de7d0091bdfac4b702ab2060289affc85d6a4.tar.xz glibc-088de7d0091bdfac4b702ab2060289affc85d6a4.zip | |
Clean up build-many-glibcs.py libcilkrts disabling.
The disabling of libcilkrts in build-many-glibcs.py has some peculiarities. It's only for the final GCC build, not the initial bootstrap one, whereas normally anything disabled for the final build should be disabled for the bootstrap one as well. And it's only for Hurd, when it's more natural by analogy with the libsanitizer disabling to disable this library unconditionally, not only for targets where it's known to break. This patch cleans up that disabling accordingly, adding a comment so it's obvious it can be removed once GCC 7 is too old to build glibc. * scripts/build-many-glibcs.py (Config.build_gcc): Use --disable-libcilkrts unconditionally, not just for the final GCC build for Hurd.
| -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) |