* guess-systype: Renamed to ...
* config.guess: ... by popular request. * configure.in, Makefile.in: Update accordingly.
This commit is contained in:
Per Bothner
parent
18fae2a8db
commit
5cc24596c8
|
|
@ -40,6 +40,7 @@ binutils
|
|||
build-all.mk
|
||||
byacc
|
||||
config
|
||||
config.guess
|
||||
config.sub
|
||||
configure
|
||||
configure.bat
|
||||
|
|
@ -62,7 +63,6 @@ glob
|
|||
gprof
|
||||
grep
|
||||
groff
|
||||
guess-systype
|
||||
h8300sim
|
||||
include
|
||||
ispell
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
Sat Jan 23 13:49:40 1993 Per Bothner (bothner@cygnus.com)
|
||||
|
||||
* guess-systype: Renamed to ...
|
||||
* config.guess: ... by popular request.
|
||||
* configure.in, Makefile.in: Update accordingly.
|
||||
|
||||
Thu Jan 21 12:20:55 1993 Per Bothner (bothner@cygnus.com)
|
||||
|
||||
* guess-systype: Patches from John Eaton <jwe@che.utexas.edu>:
|
||||
|
|
|
|||
28
Makefile.in
28
Makefile.in
|
|
@ -406,15 +406,25 @@ install-no-fixedincludes: install-dirs gcc-no-fixedincludes \
|
|||
install-fileutils install-find install-gawk install-m4 install-sed install-shellutils \
|
||||
install-textutils install-time install-wdiff
|
||||
|
||||
#
|
||||
# Install the gcc headers files, but not the fixed include files,
|
||||
# which we are not allowed to distribute. This rule is very dependent
|
||||
# on the workings of the gcc Makefile.in.
|
||||
#
|
||||
gcc-no-fixedincludes:
|
||||
@if [ -f ./gcc/Makefile ] ; then \
|
||||
rootme=`pwd` ; export rootme ; \
|
||||
(cd ./gcc; \
|
||||
$(MAKE) $(FLAGS_TO_PASS) install install-man \
|
||||
"INSTALL_HEADERS=install-common-headers install-float-h install-limits-h") ; \
|
||||
else \
|
||||
true ; \
|
||||
fi
|
||||
@if [ -f ./gcc/Makefile ]; then \
|
||||
rm -rf gcc/tmp-include; \
|
||||
mv gcc/include gcc/tmp-include 2>/dev/null; \
|
||||
mkdir gcc/include; \
|
||||
touch gcc/stmp-fixincludes; \
|
||||
rm -f gcc/stmp-headers; \
|
||||
rootme=`pwd`; export rootme; \
|
||||
srcroot=`cd $(srcdir); pwd` ; export srcroot; \
|
||||
(cd ./gcc; \
|
||||
$(MAKE) $(GCC_FLAGS_TO_PASS) install); \
|
||||
rm -rf gcc/include; \
|
||||
mv gcc/tmp-include gcc/include 2>/dev/null; \
|
||||
else true; fi
|
||||
|
||||
install.cross: install-dirs install-libiberty install-mmalloc \
|
||||
install-binutils install-opcodes install-byacc install-flex \
|
||||
|
|
@ -1439,7 +1449,7 @@ Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
|
|||
# Build GDB distributions that contain BFD, Include, Libiberty, Readline, etc
|
||||
|
||||
DEVO_SUPPORT= README Makefile.in configure configure.in \
|
||||
config.sub config etc move-if-change \
|
||||
config.guess config.sub config etc move-if-change \
|
||||
COPYING.LIB
|
||||
GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline glob
|
||||
GDB_SUPPORT_FILES= $(GDB_SUPPORT_DIRS)
|
||||
|
|
|
|||
|
|
@ -97,7 +97,8 @@ NO_EDIT="This file was generated automatically by configure. Do not edit."
|
|||
##
|
||||
|
||||
progname=$0
|
||||
PWD=`pwd`
|
||||
# if PWD already has a value, it is probably wrong.
|
||||
if [ -n "$PWD" ]; then PWD=`pwd`; fi
|
||||
|
||||
case "${progname}" in
|
||||
/*) ;;
|
||||
|
|
@ -149,11 +150,11 @@ do
|
|||
|
||||
else
|
||||
case ${arg} in
|
||||
-exec_prefix=* | --exec_prefix=* | --exec_prefi=* | --exec_pref=* | --exec_pre=* | --exec_pr=* | --exec_p=* | --exec_=* | --exec=* | --exe=* | --ex=* | --e=*)
|
||||
-exec_prefix=* | --exec_prefix=* | --exec_prefi=* | --exec_pref=* | --exec_pre=* | --exec_pr=* | --exec_p=* | --exec_=* | --exec=* | --exe=* | --ex=* | --e=* | -exec-prefix=* | --exec-prefix=* | --exec-prefi=* | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* )
|
||||
exec_prefix=`echo ${arg} | sed 's/^[-a-z_]*=//'`
|
||||
exec_prefixoption=${arg}
|
||||
;;
|
||||
-exec_prefix | --exec_prefix | --exec_prefi | --exec_pref | --exec_pre | --exec_pr | --exec_p | --exec_ | --exec | --exe | --ex | --e)
|
||||
-exec_prefix | --exec_prefix | --exec_prefi | --exec_pref | --exec_pre | --exec_pr | --exec_p | --exec_ | --exec | --exe | --ex | --e | -exec-prefix | --exec-prefix | --exec-prefi | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec-)
|
||||
next_exec_prefix=yes
|
||||
;;
|
||||
-gas | --g*)
|
||||
|
|
@ -187,26 +188,26 @@ do
|
|||
next_prefix=yes
|
||||
;;
|
||||
-rm | --rm) removing=${arg} ;;
|
||||
-program_prefix=* | --program_prefix=* | --program_prefi=* | --program_pref=* | --program_pre=* | --program_pr=* | --program_p=*)
|
||||
-program_prefix=* | --program_prefix=* | --program_prefi=* | --program_pref=* | --program_pre=* | --program_pr=* | --program_p=* | -program-prefix=* | --program-prefix=* | --program-prefi=* | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
|
||||
program_prefix=`echo ${arg} | sed 's/^[-a-z_]*=//'`
|
||||
program_prefixoption=${arg}
|
||||
;;
|
||||
-program_prefix | --program_prefix | --program_prefi | --program_pref | --program_pre | --program_pr | --program_p)
|
||||
-program_prefix | --program_prefix | --program_prefi | --program_pref | --program_pre | --program_pr | --program_p | -program-prefix | --program-prefix | --program-prefi | --program-pref | --program-pre | --program-pr | --program-p)
|
||||
next_program_prefix=yes
|
||||
;;
|
||||
-program_suffix=* | --program_suffix=* | --program_suffi=* | --program_suff=* | --program_suf=* | --program_su=* | --program_s=*)
|
||||
-program_suffix=* | --program_suffix=* | --program_suffi=* | --program_suff=* | --program_suf=* | --program_su=* | --program_s=* | -program-suffix=* | --program-suffix=* | --program-suffi=* | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
|
||||
program_suffix=`echo ${arg} | sed 's/^[-a-z_]*=//'`
|
||||
program_suffixoption=${arg}
|
||||
;;
|
||||
-program_suffix | --program_suffix | --program_suffi | --program_suff | --program_suf | --program_su | --program_s )
|
||||
-program_suffix | --program_suffix | --program_suffi | --program_suff | --program_suf | --program_su | --program_s |-program-suffix | --program-suffix | --program-suffi | --program-suff | --program-suf | --program-su | --program-s)
|
||||
next_program_suffix=yes
|
||||
;;
|
||||
-program_transform_name=* | --program_transform_name=* | --program_transform_nam=* | --program_transform_na=* | --program_transform_n=* | --program_transform_=* | --program_transform=* | --program_transfor=* | --program_transfo=* | --program_transf=* | --program_trans=* | --program_tran=* | --program_tra=* | --program_tr=* | --program_t=*)
|
||||
-program_transform_name=* | --program_transform_name=* | --program_transform_nam=* | --program_transform_na=* | --program_transform_n=* | --program_transform_=* | --program_transform=* | --program_transfor=* | --program_transfo=* | --program_transf=* | --program_trans=* | --program_tran=* | --program_tra=* | --program_tr=* | --program_t=* | -program-transform-name=* | --program-transform-name=* | --program-transform-nam=* | --program-transform-na=* | --program-transform-n=* | --program-transform-=* | --program-transform=* | --program-transfor=* | --program-transfo=* | --program-transf=* | --program-trans=* | --program-tran=* | --program-tra=* | --program-tr=* | --program-t=*)
|
||||
# Double any \ or $ in the argument
|
||||
program_transform_name="${program_transform_name} -e `echo ${arg} | sed -e 's/^[-a-z_]*=//' -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`"
|
||||
program_transform_nameoption="${program_transform_nameoption} -program_transform_name='`echo ${arg} | sed 's/^[-a-z_]*=//'`'"
|
||||
;;
|
||||
-program_transform_name | --program_transform_name | --program_transform_nam | --program_transform_na | --program_transform_n | --program_transform_ | --program_transform | --program_transfor | --program_transfo | --program_transf | --program_trans | --program_tran | --program_tra | --program_tr | --program_t)
|
||||
-program_transform_name | --program_transform_name | --program_transform_nam | --program_transform_na | --program_transform_n | --program_transform_ | --program_transform | --program_transfor | --program_transfo | --program_transf | --program_trans | --program_tran | --program_tra | --program_tr | --program_t | -program-transform-name | --program-transform-name | --program-transform-nam | --program-transform-na | --program-transform-n | --program-transform- | --program-transform | --program-transfor | --program-transfo | --program-transf | --program-trans | --program-tran | --program-tra | --program-tr | --program-t)
|
||||
next_program_transform_name=yes
|
||||
;;
|
||||
-site=* | --site=* | --sit=* | --si=*)
|
||||
|
|
@ -253,6 +254,17 @@ do
|
|||
echo "This is Cygnus Configure version" `echo ${version} | sed 's/[ $:]//g'`
|
||||
exit 0
|
||||
;;
|
||||
-with*=* | --with*=*)
|
||||
withopt=`echo ${arg} | sed 's:^-*\(with[^=]*\)=.*$:\1:;s/-/_/g'`
|
||||
withval=`echo ${arg} | sed 's:^-*with[^=]*=\(.*\)$:\1:'`
|
||||
eval $withopt="$withval"
|
||||
withoptions="$withoptions -$withopt=\"$withval\""
|
||||
;;
|
||||
-with* | --with*)
|
||||
withopt=`echo ${arg} | sed 's:^-*with:with:;s/-/_/g'`
|
||||
eval $withopt=yes
|
||||
withoptions="$withoptions -$withopt"
|
||||
;;
|
||||
-x | --x) ;;
|
||||
-* | --*)
|
||||
(echo ;
|
||||
|
|
@ -298,8 +310,17 @@ case "${fatal}" in
|
|||
echo '***' Can only configure for one host and one target at a time. 1>&2
|
||||
fatal=yes
|
||||
elif [ -z "${host_alias}" -a -z "${undefs}" ] ; then
|
||||
echo '***' You must tell me for which host you want to configure. 1>&2
|
||||
fatal=yes
|
||||
echo '- You did not tell me what kind of host system you want to configure.
|
||||
- I will attempt to guess the kind of system this is.' 1>&2
|
||||
guesssys=`echo ${progname} | sed 's/configure$/config.guess/'`
|
||||
if tmp_alias=`${guesssys}` ; then
|
||||
echo "- Looks like this is a ${tmp_alias}" 1>&2
|
||||
host_alias=${tmp_alias}
|
||||
target_alias=${tmp_alias}
|
||||
else
|
||||
echo '- Failed to guess the system type. You need to tell me.' 1>&2
|
||||
fatal=yes
|
||||
fi
|
||||
else
|
||||
case "${host_alias}" in
|
||||
"") host_alias=${undefs} ;;
|
||||
|
|
@ -324,16 +345,16 @@ if [ -n "${fatal}" -o "${host_alias}" = "help" ] ; then
|
|||
(echo "Usage: configure HOST" ;
|
||||
echo ;
|
||||
echo "Options: [defaults in brackets]" ;
|
||||
echo " -exec_prefix=MYDIR configure for installation of host dependent files into MYDIR. [\"/usr/local\"]" ;
|
||||
echo " -exec-prefix=MYDIR configure for installation of host dependent files into MYDIR. [\"/usr/local\"]" ;
|
||||
echo " -gas configure the compilers for use with gas. [native as]" ;
|
||||
echo " -help print this message. [normal config]" ;
|
||||
echo " -lang=LANG configure to build LANG. [gcc]" ;
|
||||
echo " -nfp configure the compilers default to soft floating point. [hard float]" ;
|
||||
echo " -norecursion configure this directory only. [recurse]" ;
|
||||
echo " -prefix=MYDIR configure for installation of host dependent files into MYDIR. [\"/usr/local\"]" ;
|
||||
echo " -program_prefix=FOO install programs with FOO prepended to their names. [ \"\" ]" ;
|
||||
echo " -program_suffix=FOO install programs with FOO appended to their names. [ \"\" ]" ;
|
||||
echo " -program_transform_name=FOO install programs with names transformed by sed pattern FOO. [ \"\" ]" ;
|
||||
echo " -program-prefix=FOO install programs with FOO prepended to their names. [ \"\" ]" ;
|
||||
echo " -program-suffix=FOO install programs with FOO appended to their names. [ \"\" ]" ;
|
||||
echo " -program-transform-name=FOO install programs with names transformed by sed pattern FOO. [ \"\" ]" ;
|
||||
echo " -site=SITE configure with site specific makefile for SITE" ;
|
||||
echo " -srcdir=DIR find the sources in DIR. [\".\" or \"..\"]" ;
|
||||
echo " -target=TARGET configure for TARGET. [TARGET = HOST]" ;
|
||||
|
|
@ -673,10 +694,12 @@ host_alias = ${host_alias}
|
|||
host_cpu = ${host_cpu}
|
||||
host_vendor = ${host_vendor}
|
||||
host_os = ${host_os}
|
||||
host_canonical = ${host_cpu}-${host_vendor}-${host_os}
|
||||
target_alias = ${target_alias}
|
||||
target_cpu = ${target_cpu}
|
||||
target_vendor = ${target_vendor}
|
||||
target_os = ${target_os}
|
||||
target_canonical = ${target_cpu}-${target_vendor}-${target_os}
|
||||
EOF
|
||||
case "${target_makefile_frag}" in
|
||||
"") ;;
|
||||
|
|
@ -833,7 +856,7 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then
|
|||
### The recursion line is here.
|
||||
if eval ${recprog} ${verbose} ${host_alias} -target=${target_alias} \
|
||||
${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
|
||||
${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${removing} ${redirect} ; then
|
||||
${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${removing} ${redirect} ; then
|
||||
true
|
||||
else
|
||||
exit 1
|
||||
|
|
|
|||
119
guess-systype
119
guess-systype
|
|
@ -1,119 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# This script attempts to guess a canonical system name
|
||||
# similar to the output of config.sub.
|
||||
# If it succeeds, it prints the system name on stdout, and exits with 0.
|
||||
# Otherwise, it prints an error message on stderr, and exits with 1.
|
||||
|
||||
# The plan is that this can be called by configure scripts if you don't
|
||||
# specify an explicit system type (host/target name).
|
||||
#
|
||||
# Only a few systems have been added to this list;
|
||||
# please add others (but try to keep the structure clean).
|
||||
|
||||
UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
|
||||
UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
|
||||
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
|
||||
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
|
||||
|
||||
# Note: order is significant - the case branches are not exclusive.
|
||||
|
||||
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
sun4*:SunOS:[5-9].*:*)
|
||||
echo sparc-sun-solaris2
|
||||
exit 0 ;;
|
||||
sun4*:SunOS:*:*)
|
||||
echo sparc-sun-sunos${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
sun3*:SunOS:*:*)
|
||||
echo m68k-sun-sunos${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
RISC*:ULTRIX:*:*)
|
||||
echo mips-dec-ultrix${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
*:IRIX:*:*)
|
||||
echo mips-sgi-irix${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
*:AIX:*:*)
|
||||
echo rs6000-ibm-aix
|
||||
exit 0 ;;
|
||||
9000/31?:HP-UX:*:*)
|
||||
echo m68000-hp-hpux
|
||||
exit 0 ;;
|
||||
9000/3??:HP-UX:*:*)
|
||||
echo m68k-hp-hpux
|
||||
exit 0 ;;
|
||||
9000/7??:HP-UX:*:* | 9000/8?7:HP-UX:*:* )
|
||||
echo hppa1.1-hp-hpux
|
||||
exit 0 ;;
|
||||
9000/8??:HP-UX:*:*)
|
||||
echo hppa1.0-hp-hpux
|
||||
exit 0 ;;
|
||||
C1*:ConvexOS:*:*)
|
||||
echo c1-convex-bsd
|
||||
exit 0 ;;
|
||||
C2*:ConvexOS:*:*)
|
||||
echo c2-convex-bsd
|
||||
exit 0 ;;
|
||||
CRAY*X-MP:UNICOS:*:*)
|
||||
echo xmp-cray-unicos
|
||||
exit 0 ;;
|
||||
CRAY*Y-MP:UNICOS:*:*)
|
||||
echo ymp-cray-unicos
|
||||
exit 0 ;;
|
||||
CRAY-2:UNICOS:*:*)
|
||||
echo cray2-cray-unicos
|
||||
exit 0 ;;
|
||||
i[34]86:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux
|
||||
exit 0 ;;
|
||||
i[34]86:*:3.2:*)
|
||||
if uname -X 2>/dev/null >/dev/null ; then
|
||||
UNAME_REL=`(uname -X|egrep Release|sed -e 's/.*= //')`
|
||||
(uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
|
||||
echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
|
||||
else
|
||||
echo ${UNAME_MACHINE}-unknown-sysv3.2
|
||||
fi
|
||||
exit 0 ;;
|
||||
esac
|
||||
|
||||
echo '(No uname command or uname output not recognized.)' 1>&2
|
||||
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
|
||||
|
||||
cat >dummy.c <<EOF
|
||||
main()
|
||||
{
|
||||
#if defined (sony)
|
||||
#if defined (MIPSEB)
|
||||
#else
|
||||
printf("m68k-sony-newsos\n"); exit(0);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(hp300) && !defined(hpux)
|
||||
printf("m68k-hp-bsd\n"); exit(0);
|
||||
#endif
|
||||
|
||||
#if defined (MULTIMAX) || defined (n16)
|
||||
#if defined (UMAXV)
|
||||
printf("ns32k-encore-sysv\n"); exit(0);
|
||||
#else
|
||||
#if defined (CMU)
|
||||
printf("ns32k-encore-mach\n"); exit(0);
|
||||
#else
|
||||
printf("ns32k-encore-bsd\n"); exit(0);
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
exit (1);
|
||||
}
|
||||
EOF
|
||||
|
||||
${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
|
||||
rm -f dummy.c dummy
|
||||
|
||||
echo '(Unable to guess system type)' 1>&2
|
||||
|
||||
exit 1
|
||||
Loading…
Reference in New Issue