* [PATCH] gprofng: 30910 cross test fail: can't read "CHECK_TARGET": no such variable
@ 2023-10-06 5:28 vladimir.mezentsev
0 siblings, 0 replies; only message in thread
From: vladimir.mezentsev @ 2023-10-06 5:28 UTC (permalink / raw)
To: binutils; +Cc: Vladimir Mezentsev
From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
When TCL_TRY is FALSE, the wrong check-DEJAGNU is generated.
Place "if TCL_TRY / endif" in the right place.
gprofng/ChangeLog
2023-10-05 Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
PR gprofng/30910
* Makefile.am: Correct "if TCL_TRY / endif".
* Makefile.in: Rebuild.
---
gprofng/Makefile.am | 5 +++--
gprofng/Makefile.in | 30 +++++++++---------------------
2 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/gprofng/Makefile.am b/gprofng/Makefile.am
index b1d976ab202..cb03637295d 100644
--- a/gprofng/Makefile.am
+++ b/gprofng/Makefile.am
@@ -51,12 +51,12 @@ AM_MAKEFLAGS = \
GPROFNG_CFLAGS="$(GPROFNG_CFLAGS)" \
GPROFNG_CPPFLAGS="$(GPROFNG_CPPFLAGS)"
-if TCL_TRY
.PHONY: check-small check-extra check-install
check-DEJAGNU: check-small
check-small check-extra check-install: site.exp development.exp
+if TCL_TRY
srcroot=`cd $(srcdir) && pwd`; export srcroot; \
LC_ALL=C; export LC_ALL; \
EXPECT=$(EXPECT); export EXPECT; \
@@ -74,6 +74,7 @@ check-small check-extra check-install: site.exp development.exp
BUILDDIR="$(abs_top_builddir)" $(RUNTESTFLAGS); \
else echo "WARNING: could not find \`runtest'" 1>&2; :;\
fi
+endif
development.exp: $(BFDDIR)/development.sh
$(EGREP) "(development|experimental)=" $(BFDDIR)/development.sh \
@@ -85,5 +86,5 @@ CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh
EXTRA_DEJAGNU_SITE_CONFIG = development.exp
DISTCLEANFILES = site.exp development.exp
-endif
+
diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in
index 06b563cb8ef..7e7dbe53a6c 100644
--- a/gprofng/Makefile.in
+++ b/gprofng/Makefile.in
@@ -397,9 +397,9 @@ AM_MAKEFLAGS = \
# development.sh is used to determine -Werror default.
-@TCL_TRY_TRUE@CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh
-@TCL_TRY_TRUE@EXTRA_DEJAGNU_SITE_CONFIG = development.exp
-@TCL_TRY_TRUE@DISTCLEANFILES = site.exp development.exp
+CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh
+EXTRA_DEJAGNU_SITE_CONFIG = development.exp
+DISTCLEANFILES = site.exp development.exp
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -567,18 +567,6 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-
-@TCL_TRY_FALSE@check-DEJAGNU: site.exp
-@TCL_TRY_FALSE@ srcdir='$(srcdir)'; export srcdir; \
-@TCL_TRY_FALSE@ EXPECT=$(EXPECT); export EXPECT; \
-@TCL_TRY_FALSE@ if $(SHELL) -c "$(RUNTEST) --version" > /dev/null 2>&1; then \
-@TCL_TRY_FALSE@ exit_status=0; l='$(DEJATOOL)'; for tool in $$l; do \
-@TCL_TRY_FALSE@ if $(RUNTEST) $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
-@TCL_TRY_FALSE@ then :; else exit_status=1; fi; \
-@TCL_TRY_FALSE@ done; \
-@TCL_TRY_FALSE@ else echo "WARNING: could not find '$(RUNTEST)'" 1>&2; :;\
-@TCL_TRY_FALSE@ fi; \
-@TCL_TRY_FALSE@ exit $$exit_status
site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG)
@echo 'Making a new site.exp file ...'
@echo '## these variables are automatically generated by make ##' >site.tmp
@@ -929,11 +917,11 @@ uninstall-am:
.PRECIOUS: Makefile
-@TCL_TRY_TRUE@.PHONY: check-small check-extra check-install
+.PHONY: check-small check-extra check-install
-@TCL_TRY_TRUE@check-DEJAGNU: check-small
+check-DEJAGNU: check-small
-@TCL_TRY_TRUE@check-small check-extra check-install: site.exp development.exp
+check-small check-extra check-install: site.exp development.exp
@TCL_TRY_TRUE@ srcroot=`cd $(srcdir) && pwd`; export srcroot; \
@TCL_TRY_TRUE@ LC_ALL=C; export LC_ALL; \
@TCL_TRY_TRUE@ EXPECT=$(EXPECT); export EXPECT; \
@@ -952,9 +940,9 @@ uninstall-am:
@TCL_TRY_TRUE@ else echo "WARNING: could not find \`runtest'" 1>&2; :;\
@TCL_TRY_TRUE@ fi
-@TCL_TRY_TRUE@development.exp: $(BFDDIR)/development.sh
-@TCL_TRY_TRUE@ $(EGREP) "(development|experimental)=" $(BFDDIR)/development.sh \
-@TCL_TRY_TRUE@ | $(AWK) -F= '{ print "set " $$1 " " $$2 }' > $@
+development.exp: $(BFDDIR)/development.sh
+ $(EGREP) "(development|experimental)=" $(BFDDIR)/development.sh \
+ | $(AWK) -F= '{ print "set " $$1 " " $$2 }' > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--
2.31.1
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-10-06 5:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-06 5:28 [PATCH] gprofng: 30910 cross test fail: can't read "CHECK_TARGET": no such variable vladimir.mezentsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).