mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-27 22:03:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Robert Lipe 1998-10-01 21:35:22 +00:00 committed by Jeff Law
parent 961d411902
commit 4102f62733
5 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libobjc/ChangeLog
View File

@ -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.

22
libobjc/Makefile.in
View File

@ -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 >> $@

2
libobjc/archive.c
View File

@ -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"

13
libobjc/configure vendored
View File

@ -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

11
libobjc/configure.in
View File

@ -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])