Restore release indicator to bfd/Makefile.am

Message ID 20190126170018.00002147@justmail.de
State New
Headers show
Series
  • Restore release indicator to bfd/Makefile.am
Related show

Commit Message

Gunther Nikl Jan. 26, 2019, 4 p.m.
Hello!

The GAS configure script checks bfd/Makefile.am for a line starting with
"RELEASE=y" to set the default value for run-time sanity checks. This
line got lost with "2e98a7bd882356a23076ad4a51a251d9ab1ce070" and since
that time GAS is build with sanity checks enabled unless overridden with
a configure option.

Regards,
Gunther Nikl

bfd/
2019-01-25  Gunther Nikl  <gnikl@justmail.de>

       * Makefile.am: Restore RELEASE indication.

Comments

Andreas Schwab Jan. 26, 2019, 8:56 p.m. | #1
On Jan 26 2019, Gunther Nikl <gnikl@justmail.de> wrote:

> The GAS configure script checks bfd/Makefile.am for a line starting with

> "RELEASE=y" to set the default value for run-time sanity checks. This

> line got lost with "2e98a7bd882356a23076ad4a51a251d9ab1ce070" and since

> that time GAS is build with sanity checks enabled unless overridden with

> a configure option.


It should use $development from bfd/development.sh instead.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."
Gunther Nikl Jan. 27, 2019, 12:37 p.m. | #2
On 26 Jan 2019, Andreas Schwab <schwab@linux-m68k.org> wrote:
> On Jan 26 2019, Gunther Nikl <gnikl@justmail.de> wrote:

> 

> > The GAS configure script checks bfd/Makefile.am for a line starting

> > with "RELEASE=y" to set the default value for run-time sanity

> > checks. This line got lost with

> > "2e98a7bd882356a23076ad4a51a251d9ab1ce070" and since that time GAS

> > is build with sanity checks enabled unless overridden with a

> > configure option.

> 

> It should use $development from bfd/development.sh instead.


I did not realize that the change removing "RELEASE=y" was incomplete.
Patch withdrawn.

Gunther
Alan Modra Jan. 27, 2019, 11:01 p.m. | #3
On Sat, Jan 26, 2019 at 09:56:47PM +0100, Andreas Schwab wrote:
> On Jan 26 2019, Gunther Nikl <gnikl@justmail.de> wrote:

> 

> > The GAS configure script checks bfd/Makefile.am for a line starting with

> > "RELEASE=y" to set the default value for run-time sanity checks. This

> > line got lost with "2e98a7bd882356a23076ad4a51a251d9ab1ce070" and since

> > that time GAS is build with sanity checks enabled unless overridden with

> > a configure option.

> 

> It should use $development from bfd/development.sh instead.


Like this.

	* configure.ac (ac_checking): Set from bfd/development.sh
	development variable.
	* configure: Regenerate.

diff --git a/gas/configure.ac b/gas/configure.ac
index 105d708253..cc4bae0957 100644
--- a/gas/configure.ac
+++ b/gas/configure.ac
@@ -50,10 +50,9 @@ AC_ARG_ENABLE(targets,
   *)	    enable_targets=$enableval ;;
 esac])dnl
 
-ac_checking=yes
-if grep '^RELEASE=y' ${srcdir}/../bfd/Makefile.am >/dev/null 2>/dev/null ; then
-  ac_checking=
-fi
+ac_checking=
+. ${srcdir}/../bfd/development.sh
+test "$development" = true && ac_checking=yes
 AC_ARG_ENABLE(checking,
 [  --enable-checking       enable run-time checks],
 [case "${enableval}" in

-- 
Alan Modra
Australia Development Lab, IBM

Patch

--- bfd/Makefile.am~	2019-01-26 16:10:34.000000000 +0100
+++ bfd/Makefile.am	2019-01-26 16:11:42.076491000 +0100
@@ -20,6 +20,9 @@ 
 AUTOMAKE_OPTIONS = no-dist foreign
 ACLOCAL_AMFLAGS = -I . -I .. -I ../config
 
+# Uncomment the following line when doing a release.
+# RELEASE=y
+
 INCDIR = $(srcdir)/../include
 CSEARCH = -I. -I$(srcdir) -I$(INCDIR)