BIND 10 master, updated. 98692b1e0663b4d167670b7808f26b1bb718851c [master] fix src/lib/util/threads compiler/linker flags

BIND 10 source code commits bind10-changes at lists.isc.org
Wed Oct 3 11:08:53 UTC 2012


The branch, master has been updated
       via  98692b1e0663b4d167670b7808f26b1bb718851c (commit)
      from  1886c9f3083ce3e04d42b8a91e46838ee5a1e774 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 98692b1e0663b4d167670b7808f26b1bb718851c
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Oct 3 07:07:54 2012 -0400

    [master] fix src/lib/util/threads compiler/linker flags
    
    This fixes the compilation issue shown on http://git.bind10.isc.org/~tester/builder/BIND10-valgrind/20121003092419-CentOS5-x86_64-GCC/logs/build.out
    
    Discussed on jabber

-----------------------------------------------------------------------

Summary of changes:
 src/lib/util/threads/Makefile.am       |    2 +-
 src/lib/util/threads/tests/Makefile.am |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/util/threads/Makefile.am b/src/lib/util/threads/Makefile.am
index 85f70b9..7b9fb8f 100644
--- a/src/lib/util/threads/Makefile.am
+++ b/src/lib/util/threads/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = . tests
 AM_CXXFLAGS = $(B10_CXXFLAGS)
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
-AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(BOOST_INCLUDES) $(MULTITHREADING_FLAG)
 
 lib_LTLIBRARIES = libb10-threads.la
 libb10_threads_la_SOURCES  = lock.h lock.cc
diff --git a/src/lib/util/threads/tests/Makefile.am b/src/lib/util/threads/tests/Makefile.am
index e86aedc..2d9d4f9 100644
--- a/src/lib/util/threads/tests/Makefile.am
+++ b/src/lib/util/threads/tests/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = .
 
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
-AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(BOOST_INCLUDES) $(MULTITHREADING_FLAG)
 # XXX: we'll pollute the top builddir for creating a temporary test file
 # # used to bind a UNIX domain socket so we can minimize the risk of exceeding
 # # the limit of file name path size.
@@ -25,7 +25,7 @@ run_unittests_SOURCES += thread_unittest.cc
 run_unittests_SOURCES += lock_unittest.cc
 
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
+run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) $(PTHREAD_LDFLAGS)
 
 run_unittests_LDADD = $(top_builddir)/src/lib/util/threads/libb10-threads.la
 run_unittests_LDADD += \



More information about the bind10-changes mailing list