diff options
author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-01-23 12:07:37 +0000 |
---|---|---|
committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-01-23 12:07:37 +0000 |
commit | 7df8690a400db113b722052c4dd8f374ba20d45c (patch) | |
tree | abf442078074b69615ffac23a22783a067c7a1d0 | |
parent | 48d0393f367e33534bdce6d61a3eccef2a39a60c (diff) | |
download | gcc-7df8690a400db113b722052c4dd8f374ba20d45c.tar.gz |
* configure.in (gcc_tooldir): Handle case where exec_prefix has
not been explicitly set.
* configure: Rebuilt.
Check it in now that it's tested.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@24831 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r-- | gcc/ChangeLog | 5 | ||||
-rwxr-xr-x | gcc/configure | 7 | ||||
-rw-r--r-- | 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 <rth@cygnus.com> 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} |