daily update

[deliverable/binutils-gdb.git] / gold / configure

diff --git a/gold/configure b/gold/configure
index f61307b0980e9ca19e8026108dfcb9bf5a98720d..6f53b22a05f08729baaa02e6875c01b8de4c6094 100755 (executable)
--- a/gold/configure
+++ b/gold/configure
@@ -6630,6 +6630,9 @@ fi
 
 
 
+# Set the 'development' global.
+. $srcdir/../bfd/development.sh
+
 GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6664,8 +6667,8 @@ case "${host}" in
   *) ;;
 esac
 
-# Enable -Werror by default when using gcc
-if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
+# Enable -Werror by default when using gcc.  Turn it off for releases.
+if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" -a "$development" = true ; then
     ERROR_ON_WARNING=yes
 fi