public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Hans-Peter Nilsson <hp@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-6072] objs-gcc.sh: Only bootstrap if source-directory contains gcc Date: Thu, 16 Feb 2023 00:27:43 +0000 (GMT) [thread overview] Message-ID: <20230216002743.E45EC3858C31@sourceware.org> (raw) https://gcc.gnu.org/g:384dedaf65db115e9795438d787bc8bd84bb6777 commit r13-6072-g384dedaf65db115e9795438d787bc8bd84bb6777 Author: Hans-Peter Nilsson <hp@axis.com> Date: Tue Feb 14 18:29:50 2023 +0100 objs-gcc.sh: Only bootstrap if source-directory contains gcc I use objs-gcc.sh as a preparatory step before calling btest-gcc.sh in my scripts, for example my cris-elf autotester. I thought, why not use it for native builds too. Except that use, with binutils release-style tarballs and a x86_64-pc-linux-gnu host, was broken. Now that I look at it, the script seems to have aged poorly... Still, there's a need for such a script to install stuff needed for btest-gcc.sh (and to fix up stuff if needed), and this can still be that script. So, I prefer to fix show-stoppers for common uses, while taking care to retain compatibility for use that could possibly still work, with current sources. A long time ago (before 2011, but after this script was created in 2002, and used for a few years), the binutils (and gdb and gcc) toplevel Makefile may have had a bootstrap target that worked with binutils but didn't require gcc sources to be present. Now, you'll get an error (see configure.ac line 1366 and on). Let's just build the default make-target when "bootstrap" is known to fail. An alternative would be to fold this native non-i686-pc-linux-gnu clause into the native i686-pc-linux-gnu clause, as that seems to have been originally intended as *the* single native clause, but that'd require further edits (e.g. to remove install-dejagnu and make gdb build conditional on gdb sources presence, to work with binutils tarballs, and I'd also then prefer to build not just ld, but also gas and binutils). As it's a minimal obvious change required for current native use with release-tarballs and git-checkout use(*), I'm installing this as obvious. *) Native i686-pc-linux-gnu remains broken for other use than specially constructed combined trees where dejagnu is included at the toplevel (i.e. historic Cygnus devo-type). contrib/regression: * objs-gcc.sh: Only bootstrap if source-directory contains gcc. Diff: --- contrib/regression/objs-gcc.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/regression/objs-gcc.sh b/contrib/regression/objs-gcc.sh index ea7820f33fa..d205bab1736 100755 --- a/contrib/regression/objs-gcc.sh +++ b/contrib/regression/objs-gcc.sh @@ -106,7 +106,9 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-gnu ] make all-gdb all-dejagnu all-ld || exit 1 make install-gdb install-dejagnu install-ld || exit 1 elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then - make bootstrap || exit 1 + H_MAKE_TARGET= + test -f $SOURCE/gcc/configure && H_MAKE_TARGET=bootstrap + make $H_MAKE_TARGET || exit 1 make install || exit 1 else make || exit 1
reply other threads:[~2023-02-16 0:27 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=20230216002743.E45EC3858C31@sourceware.org \ --to=hp@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: linkBe 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).