diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py
index 193d49727b..92cc613c5d 100755
@@ -1382,9 +1382,12 @@ class Config(object):
tool_build = 'gcc'
# libsanitizer commonly breaks because of glibc header
- # changes, or on unusual targets.
+ # changes, or on unusual targets. C++ pre-compiled
+ # headers are not used during the glibc build and are
+ # expensive to create.
if not self.ctx.full_gcc:
- cfg_opts += ['--disable-libsanitizer']
+ cfg_opts += ['--disable-libsanitizer',
langs = 'all' if self.ctx.full_gcc else 'c,c++'
cfg_opts += ['--enable-languages=%s' % langs,