diff options
author | Eric Botcazou <ebotcazou@adacore.com> | 2023-04-25 10:46:16 +0200 |
---|---|---|
committer | Eric Botcazou <ebotcazou@adacore.com> | 2023-04-25 10:47:21 +0200 |
commit | 971a2b892a6ae465f87c5743d046474b2e01606a (patch) | |
tree | 3a96cef94f1a8539459f022e8b3d62c7014fbff3 /gnattools | |
parent | 36d98023c8b8d2a2e286ab68b1d17402c217102d (diff) | |
download | gcc-971a2b892a6ae465f87c5743d046474b2e01606a.tar.gz |
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.
Diffstat (limited to 'gnattools')
-rwxr-xr-x | gnattools/configure | 56 | ||||
-rw-r--r-- | gnattools/configure.ac | 56 |
2 files changed, 20 insertions, 92 deletions
diff --git a/gnattools/configure b/gnattools/configure index 423527da1b6..6cdfbe67af2 100755 --- a/gnattools/configure +++ b/gnattools/configure @@ -2052,74 +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-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 5b6f34ed9f4..38a28b6ee62 100644 --- a/gnattools/configure.ac +++ b/gnattools/configure.ac @@ -53,74 +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-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) |