summaryrefslogtreecommitdiff
path: root/bootstrap.conf
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-05-27 23:34:08 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-05-27 23:41:07 -0700
commita3318fdbca6002d524f063ab5e98e7e59295d2a2 (patch)
tree75e0a512101d92a972d5bc9431c425570eb9d75f /bootstrap.conf
parent1850ea03ac1d72a4f686143463af22d2377a9f24 (diff)
downloaddiffutils-a3318fdbca6002d524f063ab5e98e7e59295d2a2.tar.gz
bootstrap: Avoid multithreading.
* bootstrap.conf (gnulib_tool_option_extras): Add "--avoid=localename --avoid=lock", because we don't want to bring in the multithreading code that recent gnulib changes would otherwise bring in. (excluded_files): Remove m4/lock.m4; no longer needed, now that we use --avoid=lock.
Diffstat (limited to 'bootstrap.conf')
-rw-r--r--bootstrap.conf6
1 files changed, 4 insertions, 2 deletions
diff --git a/bootstrap.conf b/bootstrap.conf
index 7dd289a..5aa783b 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -108,7 +108,6 @@ if test $gettext_external = 1; then
m4/glibc2.m4
m4/intdiv0.m4
m4/lcmessage.m4
- m4/lock.m4
m4/printf-posix.m4
m4/uintmax_t.m4
m4/ulonglong.m4
@@ -116,7 +115,10 @@ if test $gettext_external = 1; then
'
fi
-gnulib_tool_option_extras="--tests-base=$bt/gnulib-tests --with-tests"
+gnulib_tool_option_extras="--tests-base=$bt/gnulib-tests --with-tests
+ --avoid=localename
+ --avoid=lock
+"
# Build prerequisites
buildreq="\