This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
gcc_tooldir
- To: egcs-patches at cygnus dot com
- Subject: gcc_tooldir
- From: Jeffrey A Law <law at cygnus dot com>
- Date: Fri, 22 Jan 1999 08:14:29 -0700
- Reply-To: law at cygnus dot com
This avoids using a relative gcc_tooldir when $exec_prefix != $prefix.
* Makefile.in (gcc_tooldir): Move before first reference.
Let autoconf substitute in a value.
* configure.in (gcc_tooldir): Only use a relative path to the
tool directory if $exec_prefix == $prefix.
* configure: Rebuilt.
Index: Makefile.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/Makefile.in,v
retrieving revision 1.217
diff -c -3 -p -r1.217 Makefile.in
*** Makefile.in 1999/01/22 06:46:43 1.217
--- Makefile.in 1999/01/22 15:14:39
*************** libdir = @libdir@
*** 279,284 ****
--- 279,289 ----
libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(version)
# Used to produce a relative $(gcc_tooldir) in gcc.o
unlibsubdir = ../../..
+ # Directory in which to find other cross-compilation tools and headers.
+ # Used in install-cross.
+ gcc_tooldir = @gcc_tooldir@
+ # Since tooldir does not exist at build-time, use -B$(build_tooldir)/bin/
+ build_tooldir = $(exec_prefix)/$(target_alias)
# Directory in which the compiler finds g++ includes.
gxx_include_dir= @gxx_include_dir@
# Directory to search for site-specific includes.
*************** build_exeext = @build_exeext@
*** 297,307 ****
# Directory in which to put man pages.
mandir = @mandir@
man1dir = $(mandir)/man1
- # Directory in which to find other cross-compilation tools and headers.
- # Used in install-cross.
- gcc_tooldir = $(libsubdir)/$(unlibsubdir)/../$(target_alias)
- # Since tooldir does not exist at build-time, use -B$(build_tooldir)/bin/
- build_tooldir = $(exec_prefix)/$(target_alias)
# Dir for temp files.
tmpdir = /tmp
--- 302,307 ----
Index: configure.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/configure.in,v
retrieving revision 1.197
diff -c -3 -p -r1.197 configure.in
*** configure.in 1999/01/21 17:46:43 1.197
--- configure.in 1999/01/22 15:14:42
*************** if test x$enable_haifa != x; then
*** 4097,4102 ****
--- 4097,4111 ----
done
fi
+ # if $(exec_prefix) is not the same as $(prefix), then do not use a relative
+ # directory to get to $gcc_tooldir.
+ if test x$exec_prefix = x$prefix; then
+ gcc_tooldir='$(libsubdir)/$(unlibsubdir)/../$(target_alias)'
+ else
+ gcc_tooldir='$(tooldir)'
+ fi
+ AC_SUBST(gcc_tooldir)
+
# Warn if using init_priority.
AC_MSG_CHECKING(whether to enable init_priority by default)
if test x$enable_init_priority != xyes; then