procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libcody: fix --enable-checking=... follow-up [PR98311]

Browse source 
> The -enable-checking configure code in libcody didn't play well with
> us.  This just uses libcpp's configurey for that piece.

This doesn't set is_release anywhere, which means when --enable-checking*
or --disable-checking isn't specified, it always treats it as
--enable-checking=yes, while the normal gcc behavior is treat only trunk
as --enable-checking=yes and treat release branches as
--enable-checking=release by default.

On the other side, nothing uses those ac_assert_checking and
ac_valgrind_checking variables, so it is a waste to compute those.

2020-12-16  Jakub Jelinek  <jakub@redhat.com>

	* configure.ac: Compute is_release.
	(NMS_ENABLE_CHECKING): Simplify but not computing ac_assert_checking
	and ac_valgrind_checking the code doesn't use.
	* configure: Regenerated.
This commit is contained in:
Jakub Jelinek 2020-12-16 18:21:32 +01:00
parent 5098d35fb1
commit 652702b0c9
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libcody/configure vendored
View file

@ -2686,6 +2686,14 @@ configure_args=$ac_configure_args
# Enable expensive internal checks
is_release=
if test -d $srcdir/../gcc \
&& test -f $srcdir/../gcc/DEV-PHASE \
&& test x"`cat $srcdir/../gcc/DEV-PHASE`" != xexperimental; then
is_release=yes
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking bugurl" >&5
$as_echo_n "checking bugurl... " >&6; }
@ -2727,14 +2735,8 @@ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$IFS,"
for check in release $ac_checking_flags
do
case $check in
# these set all the flags to specific states
yes|all) ac_checking=1 ; ac_assert_checking=1 ; ac_valgrind_checking= ;;
no|none) ac_checking= ; ac_assert_checking= ; ac_valgrind_checking= ;;
release) ac_checking= ; ac_assert_checking=1 ; ac_valgrind_checking= ;;
# these enable particular checks
assert) ac_assert_checking=1 ;;
misc) ac_checking=1 ;;
valgrind) ac_valgrind_checking=1 ;;
yes|all|misc) ac_checking=1 ;;
no|none|release) ac_checking= ;;
# accept
*) ;;
esac

18
libcody/configure.ac
View file

@ -23,6 +23,14 @@ NMS_TOOL_DIRS
NMS_LINK_OPT([-Wl,--no-undefined])
NMS_CONFIG_FILES([gdbinit dox.cfg])
# Enable expensive internal checks
is_release=
if test -d $srcdir/../gcc \
&& test -f $srcdir/../gcc/DEV-PHASE \
&& test x"`cat $srcdir/../gcc/DEV-PHASE`" != xexperimental; then
is_release=yes
fi
NMS_BUGURL
dnl NMS_ENABLE_CHECKING
dnl cloned from ../libcpp/configure.ac
@ -43,14 +51,8 @@ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$IFS,"
for check in release $ac_checking_flags
do
case $check in
# these set all the flags to specific states
yes|all) ac_checking=1 ; ac_assert_checking=1 ; ac_valgrind_checking= ;;
no|none) ac_checking= ; ac_assert_checking= ; ac_valgrind_checking= ;;
release) ac_checking= ; ac_assert_checking=1 ; ac_valgrind_checking= ;;
# these enable particular checks
assert) ac_assert_checking=1 ;;
misc) ac_checking=1 ;;
valgrind) ac_valgrind_checking=1 ;;
yes|all|misc) ac_checking=1 ;;
no|none|release) ac_checking= ;;
# accept
*) ;;
esac