aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-01-27 19:53:44 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-01-27 19:54:38 +0100
commitd4d5b2ddf348bd1e310a5d73da58bae9ec09a41e (patch)
treebc6bbc3d6ba1e35a47db67055a19554cf8b30b41
parent61a3a8c6ce4e6d42c900ce83cc69256e0b0589a3 (diff)
downloadglibc-d4d5b2ddf348bd1e310a5d73da58bae9ec09a41e.tar
glibc-d4d5b2ddf348bd1e310a5d73da58bae9ec09a41e.tar.gz
glibc-d4d5b2ddf348bd1e310a5d73da58bae9ec09a41e.tar.bz2
glibc-d4d5b2ddf348bd1e310a5d73da58bae9ec09a41e.zip
hurd: fix gcc build in build-many-glibcs.py
gcc's libcilkrts has never actually supported GNU/Hurd, and doesn't automatically disable it, and the support was actually removed in gcc trunk, so that will never actually be fixed there. * scripts/build-many-glibcs.py [os == gnu] (build_gcc): Pass --disable-libcilkrts to gcc configure.
-rw-r--r--ChangeLog2
-rwxr-xr-xscripts/build-many-glibcs.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 497b00f65a..88f6d93c12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@
instead of void *.
* sysdeps/pthread/timer_create.c (timer_create): Do not use
timer_ptr2id to cast struct timer_node * to void *.
+ * scripts/build-many-glibcs.py [os == gnu] (build_gcc): Pass
+ --disable-libcilkrts to gcc configure.
2018-01-27 James Clarke <jrtc27@jrtc27.com>
diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py
index 8a2e068577..fbb701e25d 100755
--- a/scripts/build-many-glibcs.py
+++ b/scripts/build-many-glibcs.py
@@ -1329,6 +1329,8 @@ 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)