Properly set gcc_build_dir for in-tree build

	PR bootstrap/62260
	* Makefile.am (gcc_build_dir): Set to @gcc_build_dir@.
	* configure.ac (gcc_build_dir): Set and AC_SUBST according to
	$host_subdir.
	* Makefile.in: Regenerated.
	* configure: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@214524 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 28 insertions, 4 deletions

diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog
index 1b640bdc70b..632c116163c 100644
--- a/lto-plugin/ChangeLog
+++ b/lto-plugin/ChangeLog
@@ -1,3 +1,12 @@
+2014-08-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR bootstrap/62260
+	* Makefile.am (gcc_build_dir): Set to @gcc_build_dir@.
+	* configure.ac (gcc_build_dir): Set and AC_SUBST according to
+	$host_subdir.
+	* Makefile.in: Regenerated.
+	* configure: Likewise.
+
 2014-06-13  Thomas Schwinge  <thomas@codesourcery.com>
 
 	* configure.ac (--with-libiberty): New configure option.
diff --git a/lto-plugin/Makefile.am b/lto-plugin/Makefile.am
index f3fb89bbb0f..93ea6498c55 100644
--- a/lto-plugin/Makefile.am
+++ b/lto-plugin/Makefile.am
@@ -15,7 +15,7 @@ override CFLAGS := $(filter-out -fsanitize=address,$(CFLAGS))
 override LDFLAGS := $(filter-out -fsanitize=address,$(LDFLAGS))
 
 libexecsub_LTLIBRARIES = liblto_plugin.la
-gcc_build_dir = ../$(host_subdir)/gcc
+gcc_build_dir = @gcc_build_dir@
 in_gcc_libs = $(foreach lib, $(libexecsub_LTLIBRARIES), $(gcc_build_dir)/$(lib))
 
 liblto_plugin_la_SOURCES = lto-plugin.c
diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in
index 0a259e41ee8..b15d90197dc 100644
--- a/lto-plugin/Makefile.in
+++ b/lto-plugin/Makefile.in
@@ -186,6 +186,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gcc_build_dir = @gcc_build_dir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -232,7 +233,6 @@ AM_CFLAGS = @ac_lto_plugin_warn_cflags@
 AM_LDFLAGS = @ac_lto_plugin_ldflags@
 AM_LIBTOOLFLAGS = --tag=disable-static
 libexecsub_LTLIBRARIES = liblto_plugin.la
-gcc_build_dir = ../$(host_subdir)/gcc
 in_gcc_libs = $(foreach lib, $(libexecsub_LTLIBRARIES), $(gcc_build_dir)/$(lib))
 liblto_plugin_la_SOURCES = lto-plugin.c
 # Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS.
diff --git a/lto-plugin/configure b/lto-plugin/configure
index 6c36dfb5657..c34e653cfb5 100755
--- a/lto-plugin/configure
+++ b/lto-plugin/configure
@@ -622,6 +622,7 @@ EGREP
 GREP
 SED
 LIBTOOL
+gcc_build_dir
 ac_lto_plugin_ldflags
 ac_lto_plugin_warn_cflags
 am__fastdepCC_FALSE
@@ -4127,6 +4128,13 @@ if test "x$have_static_libgcc" = xyes; then
 fi
 
 
+if test x"$host_subdir" = x.; then
+   gcc_build_dir=../gcc
+else
+   gcc_build_dir=../../$host_subdir/gcc
+fi
+
+
 case `pwd` in
   *\ * | *\	*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -10599,7 +10607,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10602 "configure"
+#line 10610 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10705,7 +10713,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10708 "configure"
+#line 10716 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/lto-plugin/configure.ac b/lto-plugin/configure.ac
index 6a5ae8a4ef5..c3ae93e12a7 100644
--- a/lto-plugin/configure.ac
+++ b/lto-plugin/configure.ac
@@ -27,6 +27,13 @@ if test "x$have_static_libgcc" = xyes; then
 fi
 AC_SUBST(ac_lto_plugin_ldflags)
 
+if test x"$host_subdir" = x.; then
+   gcc_build_dir=../gcc
+else
+   gcc_build_dir=../../$host_subdir/gcc
+fi
+AC_SUBST(gcc_build_dir)
+
 AM_PROG_LIBTOOL
 ACX_LT_HOST_FLAGS
 AC_SUBST(target_noncanonical)