Makefile.in (INCLUDES): Reference gcc via $MULTIBUILDTOP.

        * Makefile.in (INCLUDES): Reference gcc via $MULTIBUILDTOP.
        (FLAGS_TO_PASS): Added.
        (runtime-info.h): Reference cc1ibj via $MULTIBUILDTOP.
        * archive.c: Change config.h to tconfig.h.
        * configure.in: Find gcc's object directory even for multilibs.

Co-Authored-By: Jeffrey A Law <law@cygnus.com>
From-SVN: r22725

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 5eb758e1255c1463aab18c84291025d78ea7332a..4ed61d9e3690466780f94e7e293160a7e41f0a8d 100644 (file)
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,4 +1,15 @@
-Wed Sep 30 18:17:17 1998  Robert Lipe  <robertl@dgii.com
+Thu Oct  1 22:33:03 1998 Robert Lipe  <robertl@dgii.com>
+                        Jeffrey A Law  (law@cygnus.com)
+
+       * Makefile.in (INCLUDES): Reference gcc via $MULTIBUILDTOP.
+       (FLAGS_TO_PASS): Added.
+       (runtime-info.h): Reference cc1ibj via $MULTIBUILDTOP.
+
+       * archive.c: Change config.h to tconfig.h.
+
+       * configure.in: Find gcc's object directory even for multilibs.
+
+Wed Sep 30 18:17:17 1998  Robert Lipe  <robertl@dgii.com>
 
        * configure.in: Escape ^ in grep string.
        * configure: Rebuilt.

diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index d8c7d14a2bfdc251b154ca42b87deca82045f05f..67536dccbb21c0c1a2a8eaf6ecf65b13790309d3 100644 (file)
--- a/libobjc/Makefile.in
+++ b/libobjc/Makefile.in
@@ -61,7 +61,7 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 ALL_CFLAGS = -I. -I$(srcdir) $(CPPFLAGS) $(DEFS) $(CFLAGS)
 
-INCLUDES = -I$(srcdir)/objc -I$(srcdir)/../gcc/config -I../../gcc
+INCLUDES = -I$(srcdir)/objc -I$(srcdir)/../gcc/config -I$(MULTIBUILDTOP)../../gcc
 
 OBJC_GCFLAGS=-DOBJC_WITH_GC=1
 OBJC_THREAD_FILE=thr-@OBJC_THREAD_FILE@
@@ -75,6 +75,24 @@ OBJC_THREAD_FILE=thr-@OBJC_THREAD_FILE@
 .m.o:
        $(CC) -c $(ALL_CFLAGS) $(INCLUDES) $<
 
+# Flags to pass to a recursive make.
+FLAGS_TO_PASS = \
+       "AR=$(AR)" \
+       "AR_FLAGS=$(AR_FLAGS)" \
+       "CC=$(CC)" \
+       "CFLAGS=$(CFLAGS)" \
+       "LIBCFLAGS=$(LIBCFLAGS)" \
+       "EXTRA_OFILES=$(EXTRA_OFILES)" \
+       "HDEFINES=$(HDEFINES)" \
+       "INSTALL=$(INSTALL)" \
+       "INSTALL_DATA=$(INSTALL_DATA)" \
+       "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+       "LDFLAGS=$(LDFLAGS)" \
+       "LOADLIBES=$(LOADLIBES)" \
+       "PICFLAG=$(PICFLAG)" \
+       "RANLIB=$(RANLIB)" \
+       "SHELL=$(SHELL)"
+
 all: libobjc.a @OBJC_BOEHM_GC@
        $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all
 
@@ -97,7 +115,7 @@ OBJS_GC = archive_gc.o class_gc.o encoding_gc.o gc_gc.o hash_gc.o \
          sarray_gc.o selector_gc.o sendmsg_gc.o thr_gc.o \
          $(OBJC_THREAD_FILE)_gc.o
 
-runtime-info.h: ../../gcc/cc1obj
+runtime-info.h: $(MULTIBUILDTOP)../../gcc/cc1obj
                echo "" > tmp-runtime
                echo "/* This file is automatically generated */" > $@
                $< -print-objc-runtime-info tmp-runtime >> $@

diff --git a/libobjc/archive.c b/libobjc/archive.c
index c762fe6186e53666f55f2ab1c822824fb3b0e29b..626f6bafea3e2324a1b5ae2436c533d41eee1114 100644 (file)
--- a/libobjc/archive.c
+++ b/libobjc/archive.c
@@ -24,7 +24,7 @@ Boston, MA 02111-1307, USA.  */
    however invalidate any other reasons why the executable file might be
    covered by the GNU General Public License.  */
 
-#include "config.h"
+#include "tconfig.h"
 #include "runtime.h"
 #include "typedstream.h"
 #include "encoding.h"

diff --git a/libobjc/configure b/libobjc/configure
index 25cdc01509daf40b6501c13514373946166eab94..a7e2dcefba1c16ac64af4c03959d91a6cab88b93 100755 (executable)
--- a/libobjc/configure
+++ b/libobjc/configure
@@ -1033,14 +1033,21 @@ fi
 
 # Determine the name of the GCC thread file.
 
+dir=`pwd`
+if test x"${with_multisubdir}" = "x" ; then
+  gccobjdir=`echo $dir/../../gcc`
+else
+  gccobjdir=`echo $dir | sed -e s:${with_multisubdir}::`/../../gcc
+fi
+
 echo $ac_n "checking for thread file""... $ac_c" 1>&6
-echo "configure:1038: checking for thread file" >&5
+echo "configure:1045: checking for thread file" >&5
 if eval "test \"`echo '$''{'objc_cv_thread_file'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -f ../../gcc/Makefile
+  if test -f $gccobjdir/Makefile
 then
-  objc_cv_thread_file=`grep \^GCC_THREAD_FILE ../../gcc/Makefile | awk -F= '{ print $2 }'`
+  objc_cv_thread_file=`grep \^GCC_THREAD_FILE $gccobjdir/Makefile | awk -F= '{ print $2 }'`
 else
   { echo "configure: error: not found" 1>&2; exit 1; }
 fi

diff --git a/libobjc/configure.in b/libobjc/configure.in
index a0c405999141db103b1e8862de9c3cda82c5abc3..8035f2ad6f7b11964a1e636245395163413e70f9 100644 (file)
--- a/libobjc/configure.in
+++ b/libobjc/configure.in
@@ -61,10 +61,17 @@ AC_HEADER_STDC
 
 # Determine the name of the GCC thread file.
 
+dir=`pwd`
+if test x"${with_multisubdir}" = "x" ; then
+  gccobjdir=`echo $dir/../../gcc`
+else
+  gccobjdir=`echo $dir | sed -e s:${with_multisubdir}::`/../../gcc
+fi
+
 AC_CACHE_CHECK([for thread file],objc_cv_thread_file,
-[if test -f ../../gcc/Makefile
+[if test -f $gccobjdir/Makefile
 then
-  objc_cv_thread_file=`grep \^GCC_THREAD_FILE ../../gcc/Makefile | awk -F= '{ print $2 }'`
+  objc_cv_thread_file=`grep \^GCC_THREAD_FILE $gccobjdir/Makefile | awk -F= '{ print $2 }'`
 else
   AC_MSG_ERROR([not found])
 fi])