public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Eric Botcazou <ebotcazou@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-9471] Remove obsolete configure code in gnattools Date: Wed, 26 Apr 2023 08:41:34 +0000 (GMT) [thread overview] Message-ID: <20230426084134.9BF4A3856DD6@sourceware.org> (raw) https://gcc.gnu.org/g:acdc1258e5ab9e86e910779d75d54d5807f738cf commit r12-9471-gacdc1258e5ab9e86e910779d75d54d5807f738cf Author: Eric Botcazou <ebotcazou@adacore.com> Date: Tue Apr 25 10:46:16 2023 +0200 Remove obsolete configure code in gnattools It was recently pointed out that we generate symbolic links to ghost files when building the GNAT tools, as the mlib-tgt-specific-*.adb files are gone. gnattools/ * configure.ac (TOOLS_TARGET_PAIRS): Remove obsolete settings. (EXTRA_GNATTOOLS): Likewise. * configure: Regenerate. Diff: --- gnattools/configure | 58 +++++++++----------------------------------------- gnattools/configure.ac | 58 +++++++++----------------------------------------- 2 files changed, 20 insertions(+), 96 deletions(-) diff --git a/gnattools/configure b/gnattools/configure index c2d755b723a..6cdfbe67af2 100755 --- a/gnattools/configure +++ b/gnattools/configure @@ -2052,76 +2052,38 @@ fi # Target-specific stuff (defaults) TOOLS_TARGET_PAIRS= - EXTRA_GNATTOOLS= - # Per-target case statement # ------------------------- case "${target}" in *-*-aix*) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-aix.adb \ - indepsw.adb<indepsw-aix.adb" + TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-aix.adb" ;; *-*-darwin*) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-darwin.adb \ - indepsw.adb<indepsw-darwin.adb" + TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-darwin.adb" ;; *-*-dragonfly*) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \ - indepsw.adb<indepsw-gnu.adb" + TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb" ;; *-*-freebsd*) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \ - indepsw.adb<indepsw-gnu.adb" + TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb" ;; *-*-linux*) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \ - indepsw.adb<indepsw-gnu.adb" - ;; - *-*-solaris*) - TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-solaris.adb" + TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb" ;; *-*-vxworks*) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-vxworks.adb \ - indepsw.adb<indepsw-gnu.adb" - ;; - hppa*-hp-hpux10*) - ;; - hppa*-hp-hpux11*) - TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-hpux.adb" - ;; - ia64-hp-hpux11*) - TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-ia64-hpux.adb" - ;; - alpha*-*-vms* | alpha*-*-openvms*) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-vms-alpha.adb \ - symbols.adb<symbols-vms.adb \ - symbols-processing.adb<symbols-processing-vms-alpha.adb" - EXTRA_GNATTOOLS='../../gnatlbr$(exeext) ../../gnatsym$(exeext)' - ;; - ia64-*-vms* | ia64-*-openvms*) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-vms-ia64.adb \ - symbols.adb<symbols-vms.adb \ - symbols-processing.adb<symbols-processing-vms-ia64.adb" - EXTRA_GNATTOOLS='../../gnatlbr$(exeext) ../../gnatsym$(exeext)' + TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb" ;; *-*-cygwin32* | *-*-mingw32* | *-*-pe) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-mingw.adb \ - indepsw.adb<indepsw-mingw.adb" + TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb" EXTRA_GNATTOOLS='../../gnatdll$(exeext)' ;; esac + + + # From user or toplevel makefile. diff --git a/gnattools/configure.ac b/gnattools/configure.ac index 40d015ce8b0..38a28b6ee62 100644 --- a/gnattools/configure.ac +++ b/gnattools/configure.ac @@ -53,76 +53,38 @@ AC_PROG_LN_S # Target-specific stuff (defaults) TOOLS_TARGET_PAIRS= -AC_SUBST(TOOLS_TARGET_PAIRS) EXTRA_GNATTOOLS= -AC_SUBST(EXTRA_GNATTOOLS) # Per-target case statement # ------------------------- case "${target}" in *-*-aix*) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-aix.adb \ - indepsw.adb<indepsw-aix.adb" + TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-aix.adb" ;; *-*-darwin*) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-darwin.adb \ - indepsw.adb<indepsw-darwin.adb" + TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-darwin.adb" ;; *-*-dragonfly*) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \ - indepsw.adb<indepsw-gnu.adb" + TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb" ;; *-*-freebsd*) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \ - indepsw.adb<indepsw-gnu.adb" + TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb" ;; *-*-linux*) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \ - indepsw.adb<indepsw-gnu.adb" - ;; - *-*-solaris*) - TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-solaris.adb" + TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb" ;; *-*-vxworks*) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-vxworks.adb \ - indepsw.adb<indepsw-gnu.adb" - ;; - hppa*-hp-hpux10*) - ;; - hppa*-hp-hpux11*) - TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-hpux.adb" - ;; - ia64-hp-hpux11*) - TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-ia64-hpux.adb" - ;; - alpha*-*-vms* | alpha*-*-openvms*) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-vms-alpha.adb \ - symbols.adb<symbols-vms.adb \ - symbols-processing.adb<symbols-processing-vms-alpha.adb" - EXTRA_GNATTOOLS='../../gnatlbr$(exeext) ../../gnatsym$(exeext)' - ;; - ia64-*-vms* | ia64-*-openvms*) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-vms-ia64.adb \ - symbols.adb<symbols-vms.adb \ - symbols-processing.adb<symbols-processing-vms-ia64.adb" - EXTRA_GNATTOOLS='../../gnatlbr$(exeext) ../../gnatsym$(exeext)' + TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb" ;; *-*-cygwin32* | *-*-mingw32* | *-*-pe) - TOOLS_TARGET_PAIRS="\ - mlib-tgt-specific.adb<mlib-tgt-specific-mingw.adb \ - indepsw.adb<indepsw-mingw.adb" + TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb" EXTRA_GNATTOOLS='../../gnatdll$(exeext)' ;; esac +AC_SUBST(TOOLS_TARGET_PAIRS) +AC_SUBST(EXTRA_GNATTOOLS) + # From user or toplevel makefile. AC_SUBST(ADA_CFLAGS)
reply other threads:[~2023-04-26 8:41 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=20230426084134.9BF4A3856DD6@sourceware.org \ --to=ebotcazou@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).