From 5949a9fc20d8cfeff1a4174cd6c433a5bd753ae6 Mon Sep 17 00:00:00 2001 From: Jeffrey A Law Date: Sat, 23 Jan 1999 12:07:37 +0000 Subject: [PATCH] configure.in (gcc_tooldir): Handle case where exec_prefix has not been explicitly set. * configure.in (gcc_tooldir): Handle case where exec_prefix has not been explicitly set. * configure: Rebuilt. Check it in now that it's tested. From-SVN: r24831 --- gcc/ChangeLog | 5 +++++ gcc/configure | 7 ++++--- gcc/configure.in | 5 +++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cd9e67f5607..f6a388db834 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ Sat Jan 23 01:37:36 1999 Jeffrey A Law (law@cygnus.com) + * configure.in (gcc_tooldir): Handle case where exec_prefix has + not been explicitly set. + * configure: Rebuilt. + * fold-const.c (lshift_double): Mark 'prec' arguments as possibly unused. @@ -7,6 +11,7 @@ Sat Jan 23 01:37:36 1999 Jeffrey A Law (law@cygnus.com) * configure.in (gcc_tooldir): When not making a relative gcc_tooldir, use $exec_prefix/$target_alias for gcc_tooldir. + * configure: Rebuilt. Fri Jan 22 11:48:56 1999 Richard Henderson diff --git a/gcc/configure b/gcc/configure index 8da69e3feee..ee0b741060a 100755 --- a/gcc/configure +++ b/gcc/configure @@ -6278,11 +6278,12 @@ if test x$enable_haifa != x; then fi # if $(exec_prefix) is not the same as $(prefix), then do not use a relative -# directory to get to $gcc_tooldir. +# directory to get to $gcc_tooldir. Also handle the case where the user did +# not specify a value for exec_prefix. # Don't set gcc_tooldir to tooldir since that's only passed in by the toplevel # make and thus we'd get different behavior depending on where we built the # sources. -if test x$exec_prefix = x$prefix; then +if test x$exec_prefix = xNONE -o x$exec_prefix = x$prefix; then gcc_tooldir='$(libsubdir)/$(unlibsubdir)/../$(target_alias)' else gcc_tooldir='$(exec_prefix)'/${target_alias} @@ -6291,7 +6292,7 @@ fi # Warn if using init_priority. echo $ac_n "checking whether to enable init_priority by default""... $ac_c" 1>&6 -echo "configure:6295: checking whether to enable init_priority by default" >&5 +echo "configure:6296: checking whether to enable init_priority by default" >&5 if test x$enable_init_priority != xyes; then enable_init_priority=no fi diff --git a/gcc/configure.in b/gcc/configure.in index dd6acd6192c..c3af386399a 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -4098,11 +4098,12 @@ if test x$enable_haifa != x; then fi # if $(exec_prefix) is not the same as $(prefix), then do not use a relative -# directory to get to $gcc_tooldir. +# directory to get to $gcc_tooldir. Also handle the case where the user did +# not specify a value for exec_prefix. # Don't set gcc_tooldir to tooldir since that's only passed in by the toplevel # make and thus we'd get different behavior depending on where we built the # sources. -if test x$exec_prefix = x$prefix; then +if test x$exec_prefix = xNONE -o x$exec_prefix = x$prefix; then gcc_tooldir='$(libsubdir)/$(unlibsubdir)/../$(target_alias)' else gcc_tooldir='$(exec_prefix)'/${target_alias} -- 2.30.2