From 3efd0bc4e443132653d42aca1a80b22b14930dd8 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Thu, 7 Nov 2019 11:30:58 +0300 Subject: Build gctba library Issue #268 (bdgwc). The library exports only GC_throw_bad_alloc C++ function. It is intended to solve "undefined reference to GC_throw_bad_alloc" linkage error when the client needs to avoid linking with gccpp library (to avoid "::new" redirection, in turn). * CMakeLists.txt (enable_throw_bad_alloc_library): New option (ON by default). * CMakeLists.txt [enable_cplusplus && enable_throw_bad_alloc_library] (gctba): New library. * Makefile.am [CPLUSPLUS && GC_TBA_LIBRARY] (lib_LTLIBRARIES): Add libgctba.la item. * Makefile.am [CPLUSPLUS && GC_TBA_LIBRARY] (libgctba_la_SOURCES, libgctba_la_LIBADD, libgctba_la_LDFLAGS): New variable. * Makefile.direct: Update head comment (mention gctba.a). * Makefile.direct (bsd-libgctba.a, gctba.a): New target. * NT_MAKEFILE (gctba.lib): Likewise. * WCC_MAKEFILE (gctba.lib): Likewise. * WCC_MAKEFILE [!ENABLE_STATIC] (gctba.dll): Likewise. * Makefile.direct (bsd-libgc.a): Move gctba.a to bsd-libgctba.a. * Makefile.direct (BSD-pkg-install): Copy bsd-libgctba.a; install libgctba.a. * Makefile.direct (c++): Add dependency on gc_badalc.o; call rus, $(AR) and $(RANLIB) for gctba.a. * NT_MAKEFILE (all): Add dependency on gctba.lib. * WCC_MAKEFILE (all): Likewise. * README.QUICK: Update information about "make c++" (reference libgctba.a, libgctba.so and doc/gcinterface.md). * configure.ac (throw-bad-alloc-library): Specify new AC_ARG_ENABLE. * configure.ac (GC_TBA_LIBRARY): New AM_CONDITIONAL. * doc/gcinterface.md (Class inheritance based interface): Add information about libgctba library; document GC_NEW_ABORTS_ON_OOM and GC_INCLUDE_NEW macros. --- NT_MAKEFILE | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'NT_MAKEFILE') diff --git a/NT_MAKEFILE b/NT_MAKEFILE index 628ca5ed..d725f925 100644 --- a/NT_MAKEFILE +++ b/NT_MAKEFILE @@ -98,7 +98,7 @@ OBJS= extra\gc.obj extra\msvc_dbg.obj COBJS= cord\cordbscs.obj cord\cordxtra.obj cord\cordprnt.obj -all: gc.lib cord.lib gccpp.lib +all: gc.lib cord.lib gccpp.lib gctba.lib check: gctest.exe test_cpp.exe cordtest.exe de.exe gctest.exe @@ -126,6 +126,10 @@ cord.lib: $(COBJS) gccpp.lib: gc_badalc.obj gc_cpp.obj lib /out:gccpp.lib /MACHINE:$(CPU) gc_badalc.obj gc_cpp.obj +# The same as gccpp.lib but contains only gc_badalc.obj. +gctba.lib: gc_badalc.obj + lib /out:gctba.lib /MACHINE:$(CPU) gc_badalc.obj + !ELSE gc.lib: $(OBJS) @@ -137,6 +141,9 @@ cord.lib: $(COBJS) gc.lib gccpp.lib: gc_badalc.obj gc_cpp.obj gc.lib $(link) $(ldebug) gc.lib /subsystem:windows /dll /INCREMENTAL:NO /pdb:"gccpp.pdb" /out:gccpp.dll /implib:gccpp.lib /MACHINE:$(CPU) gc_badalc.obj gc_cpp.obj +gctba.lib: gc_badalc.obj gc.lib + $(link) $(ldebug) gc.lib /subsystem:windows /dll /INCREMENTAL:NO /pdb:"gctba.pdb" /out:gctba.dll /implib:gctba.lib /MACHINE:$(CPU) gc_badalc.obj + !ENDIF gctest.exe: gc.lib tests\test.obj -- cgit v1.2.1