public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Martin Liska <marxin@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r13-3983] Revert "sphinx: fix building if sphinx-build is missing"
Date: Mon, 14 Nov 2022 08:38:27 +0000 (GMT) [thread overview]
Message-ID: <20221114083827.4DE953844002@sourceware.org> (raw)
https://gcc.gnu.org/g:50b2e0fc3604e9f69a5e3b6ad1902e681764edc5
commit r13-3983-g50b2e0fc3604e9f69a5e3b6ad1902e681764edc5
Author: Martin Liska <mliska@suse.cz>
Date: Sun Nov 13 21:58:22 2022 +0100
Revert "sphinx: fix building if sphinx-build is missing"
This reverts commit 1f9c79367e136e0ca5b775562e6111e1a0d0046f.
Diff:
---
libgomp/Makefile.in | 5 +----
libitm/Makefile.in | 5 +----
libquadmath/Makefile.in | 4 +---
3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in
index 0c016980c3d..9d1787d8458 100644
--- a/libgomp/Makefile.in
+++ b/libgomp/Makefile.in
@@ -1304,10 +1304,7 @@ stamp-geninsrc: doc/info/texinfo/libgomp.info
@touch $@
doc/info/texinfo/libgomp.info: $(SPHINX_FILES)
- + if [ x$(HAS_SPHINX_BUILD) = xhas-sphinx-build ]; then \
- make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD); \
- else true; fi
-
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD)
# target overrides
-include $(tmake_file)
diff --git a/libitm/Makefile.in b/libitm/Makefile.in
index f51858db8c7..38a7e5bf731 100644
--- a/libitm/Makefile.in
+++ b/libitm/Makefile.in
@@ -1121,10 +1121,7 @@ stamp-geninsrc: doc/info/texinfo/libitm.info
@touch $@
doc/info/texinfo/libitm.info: $(SPHINX_FILES)
- + if [ x$(HAS_SPHINX_BUILD) = xhas-sphinx-build ]; then \
- make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD); \
- else true; fi
-
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD)
# GNU Make needs to see an explicit $(MAKE) variable in the command it
# runs to enable its job server during parallel builds. Hence the
diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in
index 864ebc6048a..d551f56ce62 100644
--- a/libquadmath/Makefile.in
+++ b/libquadmath/Makefile.in
@@ -1374,9 +1374,7 @@ SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
export BUGURL=$(REPORT_BUGS_TO)
doc/info/texinfo/libquadmath.info: $(SPHINX_FILES)
- + if [ x$(HAS_SPHINX_BUILD) = xhas-sphinx-build ]; then \
- make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD); \
- else true; fi
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD)
# GNU Make needs to see an explicit $(MAKE) variable in the command it
# runs to enable its job server during parallel builds. Hence the
reply other threads:[~2022-11-14 8:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221114083827.4DE953844002@sourceware.org \
--to=marxin@gcc.gnu.org \
--cc=gcc-cvs@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).