[m-rev.] diff: *11.07 branch only* build boehmgc collector under Solaris 10

[Peter Ross]

Hi,


===================================================================


Estimated hours taken: 4
Branches: 11.07

Allow the boehmgc collector to build under Solaris 10.

*Note* this is only on the 11.07 branch, the correct fix for the trunk is to
upgrade to gc 7.2, as this builds cleanly under Solaris 10.

boehm_gc/libatomic_ops/src/Makefile.in:
	Disable the build of libatomic_ops_gpl.a as it doesn't build under
	Solaris 10 and it's not needed.


Index: boehm_gc/libatomic_ops/src/Makefile.in
===================================================================
RCS file: /home/mercury1/repository/mercury/boehm_gc/libatomic_ops/src/Makefile.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.in
--- boehm_gc/libatomic_ops/src/Makefile.in	23 Feb 2010 06:28:40 -0000	1.1.1.1
+++ boehm_gc/libatomic_ops/src/Makefile.in	15 Jul 2012 09:55:25 -0000
@@ -199,8 +199,14 @@
 top_srcdir = @top_srcdir@
 SUBDIRS = atomic_ops
 AM_CFLAGS = @PICFLAG@
-include_HEADERS = atomic_ops.h atomic_ops_stack.h atomic_ops_malloc.h
-lib_LIBRARIES = libatomic_ops.a libatomic_ops_gpl.a
+
+# Disable the build of libatomic_ops_gpl.a as it doesn't build under Solaris 10
+# and it's not needed to build the Mecury version of the boehmgc collector.
+#include_HEADERS = atomic_ops.h atomic_ops_stack.h atomic_ops_malloc.h
+#lib_LIBRARIES = libatomic_ops.a libatomic_ops_gpl.a
+include_HEADERS = atomic_ops.h
+lib_LIBRARIES = libatomic_ops.a
+
 @NEED_ASM_FALSE at libatomic_ops_a_SOURCES = atomic_ops.c
 @NEED_ASM_TRUE at libatomic_ops_a_SOURCES = atomic_ops.c atomic_ops_sysdeps.S
 libatomic_ops_gpl_a_SOURCES = atomic_ops_stack.c atomic_ops_malloc.c

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------