Browse Source

[clang-build] Revert "[clang-build] specify -pthread in CXXFLAGS and via system-indepedent variable."

This reverts commit d62a1e4250c88e765b3cd7f77fe9a948db0a565d.

I believe the sense of the change is correct, but it has effects on
other OSes, so it's probably better to use clang specific workaround
(will commit it later).
JINMEI Tatuya 12 years ago
parent
commit
b211a06011
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/bin/resolver/Makefile.am

+ 1 - 1
src/bin/resolver/Makefile.am

@@ -62,7 +62,6 @@ b10_resolver_SOURCES += common.cc common.h
 
 
 nodist_b10_resolver_SOURCES = resolver_messages.cc resolver_messages.h
 nodist_b10_resolver_SOURCES = resolver_messages.cc resolver_messages.h
 
 
-b10_resolver_CXXFLAGS = $(AM_CPPFLAGS) $(MULTITHREADING_FLAG)
 
 
 b10_resolver_LDADD =  $(top_builddir)/src/lib/dns/libb10-dns++.la
 b10_resolver_LDADD =  $(top_builddir)/src/lib/dns/libb10-dns++.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
@@ -78,6 +77,7 @@ b10_resolver_LDADD += $(top_builddir)/src/lib/server_common/libb10-server-common
 b10_resolver_LDADD += $(top_builddir)/src/lib/cache/libb10-cache.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/cache/libb10-cache.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/nsas/libb10-nsas.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/nsas/libb10-nsas.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/resolve/libb10-resolve.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/resolve/libb10-resolve.la
+b10_resolver_LDFLAGS = -pthread
 
 
 # TODO: config.h.in is wrong because doesn't honor pkgdatadir
 # TODO: config.h.in is wrong because doesn't honor pkgdatadir
 # and can't use @datadir@ because doesn't expand default ${prefix}
 # and can't use @datadir@ because doesn't expand default ${prefix}