From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 4DE953844002; Mon, 14 Nov 2022 08:38:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4DE953844002 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668415107; bh=GAX//uJe9m2TsvfVwU9LCYdpQ6E2nH2DQLhhp9ek1/M=; h=From:To:Subject:Date:From; b=Kbg+/DAfDZyWRZ7k9kz06lCYj1H+TeMZQzJEQUa3a4MZroaH44I5/ySq0R0KtGN2t Q4eR6PUbDaBl06AnS+v+kiJlY0cOeRV9jXLFAqRpxtMG9wxnP0O7Id2AMaDBGgul1T 24SngXDE869khR9uVDp8XzC5w/uZdWyd/U3TEfPE= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3983] Revert "sphinx: fix building if sphinx-build is missing" X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: 3c1d0356cfae9b8e7920f2929ea808ade7988075 X-Git-Newrev: 50b2e0fc3604e9f69a5e3b6ad1902e681764edc5 Message-Id: <20221114083827.4DE953844002@sourceware.org> Date: Mon, 14 Nov 2022 08:38:27 +0000 (GMT) List-Id: https://gcc.gnu.org/g:50b2e0fc3604e9f69a5e3b6ad1902e681764edc5 commit r13-3983-g50b2e0fc3604e9f69a5e3b6ad1902e681764edc5 Author: Martin Liska 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