configure (gcc_version): Initialize properly depending on how and where configure is started.
d
egcs/ChangeLog:
1998-06-24 Manfred Hollstein <manfred@s-direktnet.de>
* configure (gcc_version): Initialize properly depending on
how and where configure is started.
(recursion line): Pass a --with-gcc-version=${gcc_version}
to configures in subdirs.
egcs/libf2c/ChangeLog.egcs:
1998-06-24 Manfred Hollstein <manfred@s-direktnet.de>
* Makefile.in (version): Rename to gcc_version.
* configure.in (version): Likewise.
(gcc_version): Add code to use an option passed from parent configure.
* configure: Regenerate.
egcs/libio/ChangeLog:
1998-06-24 Manfred Hollstein <manfred@s-direktnet.de>
* config.shared (FLAGS_TO_PASS): Add gcc_version.
From-SVN: r20687
This commit is contained in:
Manfred Hollstein
parent
50c4c9f7bd
commit
6174dcf375
|
|
@ -701,10 +701,31 @@ if [ "${program_prefix}" != "" ] ; then
|
|||
program_transform_name="-e s,^,${program_prefix}, ${program_transform_name}"
|
||||
fi
|
||||
|
||||
# If gcc's sources are available, extract its version number which is used by
|
||||
# $libsubdir.
|
||||
if [ -f $srcdir/gcc/version.c ]; then
|
||||
gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${srcdir}/gcc/version.c`
|
||||
# Check whether --with-gcc-version was given.
|
||||
if [ "${with_gcc_version+set}" = set ]; then
|
||||
gcc_version="$with_gcc_version"
|
||||
else
|
||||
if [ "${srcdir}" = "." ] ; then
|
||||
if [ "${with_target_subdir}" != "." ] ; then
|
||||
topsrcdir=${with_multisrctop}../..
|
||||
else
|
||||
topsrcdir=${with_multisrctop}..
|
||||
fi
|
||||
else
|
||||
case ${srcdir} in
|
||||
*/*/* ) # Need to do this only in subdirectories.
|
||||
topsrcdir=${srcdir}/..
|
||||
;;
|
||||
* ) # We are already in the topsrcdir.
|
||||
topsrcdir=${srcdir}
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
# If gcc's sources are available, extract its version number which is used by
|
||||
# $libsubdir.
|
||||
if [ -f ${topsrcdir}/gcc/version.c ] ; then
|
||||
gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${topsrcdir}/gcc/version.c`
|
||||
fi
|
||||
fi
|
||||
|
||||
# If CC and CXX are not set in the environment, and the Makefile
|
||||
|
|
@ -1447,7 +1468,7 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then
|
|||
if [ ! -z "${recprog}" ] ; then
|
||||
if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${target_alias} \
|
||||
${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
|
||||
${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${floating_pointoption} ${cache_file_option} ${removing} ${other_options} ${redirect} ; then
|
||||
${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} --with-gcc-version=${gcc_version} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${floating_pointoption} ${cache_file_option} ${removing} ${other_options} ${redirect} ; then
|
||||
true
|
||||
else
|
||||
echo Configure in `pwd` failed, exiting. 1>&2
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ srcdir = @srcdir@
|
|||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
target_alias = @target_alias@
|
||||
version = @version@
|
||||
gcc_version = @gcc_version@
|
||||
|
||||
bindir = $(exec_prefix)/bin
|
||||
libdir = $(exec_prefix)/lib
|
||||
|
|
@ -36,7 +36,7 @@ mandir = $(prefix)/man
|
|||
infodir = $(prefix)/info
|
||||
includedir = $(prefix)/include
|
||||
docdir = $(datadir)/doc
|
||||
libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(version)
|
||||
libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version)
|
||||
|
||||
TO_TOPDIR = ..
|
||||
|
||||
|
|
|
|||
|
|
@ -1862,7 +1862,16 @@ test -f libI77/makefile && mv libI77/makefile libI77/makefile.ori
|
|||
test -f libU77/makefile && mv libU77/makefile libU77/makefile.ori
|
||||
|
||||
# Get the version number from the toplevel
|
||||
version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${srcdir}/../gcc/version.c`
|
||||
if test x${with_gcc_version} = x; then
|
||||
# Try to get the version number from a hopefully existing gcc directory.
|
||||
if test -d ${srcdir}/../gcc; then
|
||||
gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${srcdir}/../gcc/version.c`
|
||||
else
|
||||
gcc_version=UNKNOWN
|
||||
fi
|
||||
else
|
||||
gcc_version=${with_gcc_version}
|
||||
fi
|
||||
|
||||
ac_aux_dir=
|
||||
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
|
||||
|
|
@ -1911,7 +1920,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
|
|||
fi
|
||||
|
||||
echo $ac_n "checking host system type""... $ac_c" 1>&6
|
||||
echo "configure:1915: checking host system type" >&5
|
||||
echo "configure:1924: checking host system type" >&5
|
||||
|
||||
host_alias=$host
|
||||
case "$host_alias" in
|
||||
|
|
@ -1932,7 +1941,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|||
echo "$ac_t""$host" 1>&6
|
||||
|
||||
echo $ac_n "checking target system type""... $ac_c" 1>&6
|
||||
echo "configure:1936: checking target system type" >&5
|
||||
echo "configure:1945: checking target system type" >&5
|
||||
|
||||
target_alias=$target
|
||||
case "$target_alias" in
|
||||
|
|
@ -1950,7 +1959,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|||
echo "$ac_t""$target" 1>&6
|
||||
|
||||
echo $ac_n "checking build system type""... $ac_c" 1>&6
|
||||
echo "configure:1954: checking build system type" >&5
|
||||
echo "configure:1963: checking build system type" >&5
|
||||
|
||||
build_alias=$build
|
||||
case "$build_alias" in
|
||||
|
|
@ -2126,7 +2135,7 @@ s%@RANLIB_TEST@%$RANLIB_TEST%g
|
|||
s%@CPP@%$CPP%g
|
||||
s%@F2C_INTEGER@%$F2C_INTEGER%g
|
||||
s%@F2C_LONGINT@%$F2C_LONGINT%g
|
||||
s%@version@%$version%g
|
||||
s%@gcc_version@%$gcc_version%g
|
||||
s%@host@%$host%g
|
||||
s%@host_alias@%$host_alias%g
|
||||
s%@host_cpu@%$host_cpu%g
|
||||
|
|
|
|||
|
|
@ -344,8 +344,17 @@ test -f libI77/makefile && mv libI77/makefile libI77/makefile.ori
|
|||
test -f libU77/makefile && mv libU77/makefile libU77/makefile.ori
|
||||
|
||||
# Get the version number from the toplevel
|
||||
version=`sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/' < ${srcdir}/../gcc/version.c`
|
||||
AC_SUBST(version)
|
||||
if test x${with_gcc_version} = x; then
|
||||
# Try to get the version number from a hopefully existing gcc directory.
|
||||
if test -d ${srcdir}/../gcc; then
|
||||
gcc_version=`sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/' < ${srcdir}/../gcc/version.c`
|
||||
else
|
||||
gcc_version=UNKNOWN
|
||||
fi
|
||||
else
|
||||
gcc_version=${with_gcc_version}
|
||||
fi
|
||||
AC_SUBST(gcc_version)
|
||||
AC_CANONICAL_SYSTEM
|
||||
AC_SUBST(target_alias)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue