diff options
author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-18 08:15:27 +0000 |
---|---|---|
committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-18 08:15:27 +0000 |
commit | 7170e5e2095cdc54e9554f91067730ed9ea301a9 (patch) | |
tree | eac764c9f401c3839e3baefd9b522cc888310b89 /libobjc | |
parent | d72d5aa1686a0149bd57467ac942883e6b0e5cf1 (diff) | |
download | gcc-7170e5e2095cdc54e9554f91067730ed9ea301a9.tar.gz |
boehm-gc/
2008-07-18 Matthias Klose <doko@ubuntu.com>
* configure.ac (AC_CONFIG_FILES): Add threads.mk.
* threads.mk.in: New.
* Makefile.in, configure: Regenerate.
libobjc/
2008-07-18 Matthias Klose <doko@ubuntu.com>
* Makefile.in: Include ../boehm-gc/threads.mk.
(OBJC_BOEHM_GC_LIBS): Define, (libobjc_gc$(libsuffix).la): Use it.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137939 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc')
-rw-r--r-- | libobjc/ChangeLog | 5 | ||||
-rw-r--r-- | libobjc/Makefile.in | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index aabb9fd9eff..32b5bde991e 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,8 @@ +2008-07-18 Matthias Klose <doko@ubuntu.com> + + * Makefile.in: Include ../boehm-gc/threads.mk. + (OBJC_BOEHM_GC_LIBS): Define, (libobjc_gc$(libsuffix).la): Use it. + 2008-07-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * Makefile.in (install-info): New stub target. diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index f9538af5cda..130e936e0cb 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -48,6 +48,8 @@ extra_ldflags_libobjc = @extra_ldflags_libobjc@ top_builddir = . +include ../boehm-gc/threads.mk + libdir = $(exec_prefix)/lib libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version) @@ -95,6 +97,7 @@ OBJC_GCFLAGS=-DOBJC_WITH_GC=1 OBJC_THREAD_FILE=thr-objc OBJC_BOEHM_GC=@OBJC_BOEHM_GC@ OBJC_BOEHM_GC_INCLUDES=@OBJC_BOEHM_GC_INCLUDES@ +OBJC_BOEHM_GC_LIBS=../boehm-gc/libgcjgc_convenience.la $(thread_libs_and_flags) INCLUDES = -I$(srcdir)/objc -I$(srcdir)/$(MULTISRCTOP)../gcc \ -I$(srcdir)/$(MULTISRCTOP)../gcc/config \ @@ -284,7 +287,7 @@ libobjc$(libsuffix).la: $(OBJS) $(LTLDFLAGS) libobjc_gc$(libsuffix).la: $(OBJS_GC) - $(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) \ + $(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) $(OBJC_BOEHM_GC_LIBS) \ -rpath $(toolexeclibdir) \ -version-info $(LIBOBJC_GC_VERSION) $(extra_ldflags_libobjc) \ $(LTLDFLAGS) |