Skip to content

Commit 971a2b8

Browse files
author
Eric Botcazou
committed
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.
1 parent 36d9802 commit 971a2b8

File tree

2 files changed

+20
-92
lines changed

2 files changed

+20
-92
lines changed

gnattools/configure

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2052,74 +2052,38 @@ fi
20522052
20532053
# Target-specific stuff (defaults)
20542054
TOOLS_TARGET_PAIRS=
2055-
20562055
EXTRA_GNATTOOLS=
20572056
2058-
20592057
# Per-target case statement
20602058
# -------------------------
20612059
case "${target}" in
20622060
*-*-aix*)
2063-
TOOLS_TARGET_PAIRS="\
2064-
mlib-tgt-specific.adb<mlib-tgt-specific-aix.adb \
2065-
indepsw.adb<indepsw-aix.adb"
2061+
TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-aix.adb"
20662062
;;
20672063
*-*-darwin*)
2068-
TOOLS_TARGET_PAIRS="\
2069-
mlib-tgt-specific.adb<mlib-tgt-specific-darwin.adb \
2070-
indepsw.adb<indepsw-darwin.adb"
2064+
TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-darwin.adb"
20712065
;;
20722066
*-*-dragonfly*)
2073-
TOOLS_TARGET_PAIRS="\
2074-
mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
2075-
indepsw.adb<indepsw-gnu.adb"
2067+
TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb"
20762068
;;
20772069
*-*-freebsd*)
2078-
TOOLS_TARGET_PAIRS="\
2079-
mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
2080-
indepsw.adb<indepsw-gnu.adb"
2070+
TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb"
20812071
;;
20822072
*-*-linux*)
2083-
TOOLS_TARGET_PAIRS="\
2084-
mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
2085-
indepsw.adb<indepsw-gnu.adb"
2086-
;;
2087-
*-*-solaris*)
2088-
TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-solaris.adb"
2073+
TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb"
20892074
;;
20902075
*-*-vxworks*)
2091-
TOOLS_TARGET_PAIRS="\
2092-
mlib-tgt-specific.adb<mlib-tgt-specific-vxworks.adb \
2093-
indepsw.adb<indepsw-gnu.adb"
2094-
;;
2095-
hppa*-hp-hpux11*)
2096-
TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-hpux.adb"
2097-
;;
2098-
ia64-hp-hpux11*)
2099-
TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-ia64-hpux.adb"
2100-
;;
2101-
alpha*-*-vms* | alpha*-*-openvms*)
2102-
TOOLS_TARGET_PAIRS="\
2103-
mlib-tgt-specific.adb<mlib-tgt-specific-vms-alpha.adb \
2104-
symbols.adb<symbols-vms.adb \
2105-
symbols-processing.adb<symbols-processing-vms-alpha.adb"
2106-
EXTRA_GNATTOOLS='../../gnatlbr$(exeext) ../../gnatsym$(exeext)'
2107-
;;
2108-
ia64-*-vms* | ia64-*-openvms*)
2109-
TOOLS_TARGET_PAIRS="\
2110-
mlib-tgt-specific.adb<mlib-tgt-specific-vms-ia64.adb \
2111-
symbols.adb<symbols-vms.adb \
2112-
symbols-processing.adb<symbols-processing-vms-ia64.adb"
2113-
EXTRA_GNATTOOLS='../../gnatlbr$(exeext) ../../gnatsym$(exeext)'
2076+
TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb"
21142077
;;
21152078
*-*-cygwin32* | *-*-mingw32* | *-*-pe)
2116-
TOOLS_TARGET_PAIRS="\
2117-
mlib-tgt-specific.adb<mlib-tgt-specific-mingw.adb \
2118-
indepsw.adb<indepsw-mingw.adb"
2079+
TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb"
21192080
EXTRA_GNATTOOLS='../../gnatdll$(exeext)'
21202081
;;
21212082
esac
21222083
2084+
2085+
2086+
21232087
# From user or toplevel makefile.
21242088
21252089

gnattools/configure.ac

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -53,74 +53,38 @@ AC_PROG_LN_S
5353

5454
# Target-specific stuff (defaults)
5555
TOOLS_TARGET_PAIRS=
56-
AC_SUBST(TOOLS_TARGET_PAIRS)
5756
EXTRA_GNATTOOLS=
58-
AC_SUBST(EXTRA_GNATTOOLS)
5957

6058
# Per-target case statement
6159
# -------------------------
6260
case "${target}" in
6361
*-*-aix*)
64-
TOOLS_TARGET_PAIRS="\
65-
mlib-tgt-specific.adb<mlib-tgt-specific-aix.adb \
66-
indepsw.adb<indepsw-aix.adb"
62+
TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-aix.adb"
6763
;;
6864
*-*-darwin*)
69-
TOOLS_TARGET_PAIRS="\
70-
mlib-tgt-specific.adb<mlib-tgt-specific-darwin.adb \
71-
indepsw.adb<indepsw-darwin.adb"
65+
TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-darwin.adb"
7266
;;
7367
*-*-dragonfly*)
74-
TOOLS_TARGET_PAIRS="\
75-
mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
76-
indepsw.adb<indepsw-gnu.adb"
68+
TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb"
7769
;;
7870
*-*-freebsd*)
79-
TOOLS_TARGET_PAIRS="\
80-
mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
81-
indepsw.adb<indepsw-gnu.adb"
71+
TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb"
8272
;;
8373
*-*-linux*)
84-
TOOLS_TARGET_PAIRS="\
85-
mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
86-
indepsw.adb<indepsw-gnu.adb"
87-
;;
88-
*-*-solaris*)
89-
TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-solaris.adb"
74+
TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb"
9075
;;
9176
*-*-vxworks*)
92-
TOOLS_TARGET_PAIRS="\
93-
mlib-tgt-specific.adb<mlib-tgt-specific-vxworks.adb \
94-
indepsw.adb<indepsw-gnu.adb"
95-
;;
96-
hppa*-hp-hpux11*)
97-
TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-hpux.adb"
98-
;;
99-
ia64-hp-hpux11*)
100-
TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-ia64-hpux.adb"
101-
;;
102-
alpha*-*-vms* | alpha*-*-openvms*)
103-
TOOLS_TARGET_PAIRS="\
104-
mlib-tgt-specific.adb<mlib-tgt-specific-vms-alpha.adb \
105-
symbols.adb<symbols-vms.adb \
106-
symbols-processing.adb<symbols-processing-vms-alpha.adb"
107-
EXTRA_GNATTOOLS='../../gnatlbr$(exeext) ../../gnatsym$(exeext)'
108-
;;
109-
ia64-*-vms* | ia64-*-openvms*)
110-
TOOLS_TARGET_PAIRS="\
111-
mlib-tgt-specific.adb<mlib-tgt-specific-vms-ia64.adb \
112-
symbols.adb<symbols-vms.adb \
113-
symbols-processing.adb<symbols-processing-vms-ia64.adb"
114-
EXTRA_GNATTOOLS='../../gnatlbr$(exeext) ../../gnatsym$(exeext)'
77+
TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb"
11578
;;
11679
*-*-cygwin32* | *-*-mingw32* | *-*-pe)
117-
TOOLS_TARGET_PAIRS="\
118-
mlib-tgt-specific.adb<mlib-tgt-specific-mingw.adb \
119-
indepsw.adb<indepsw-mingw.adb"
80+
TOOLS_TARGET_PAIRS="indepsw.adb<indepsw-gnu.adb"
12081
EXTRA_GNATTOOLS='../../gnatdll$(exeext)'
12182
;;
12283
esac
12384

85+
AC_SUBST(TOOLS_TARGET_PAIRS)
86+
AC_SUBST(EXTRA_GNATTOOLS)
87+
12488
# From user or toplevel makefile.
12589
AC_SUBST(ADA_CFLAGS)
12690

0 commit comments

Comments
 (0)