78/376: Pass -pthread only for programs that need it

[Ludovic Courtès]

civodul pushed a commit to tag 1.8
in repository guix.

commit bd91453bb146446e4763ea2dbc934dd271fe544b
Author: Eelco Dolstra <address@hidden>
Date:   Wed Jul 23 19:48:18 2014 +0200

    Pass -pthread only for programs that need it
---
 local.mk                |    1 -
 src/nix-daemon/local.mk |    2 ++
 src/nix-store/local.mk  |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/local.mk b/local.mk
index cb628fa..6361e18 100644
--- a/local.mk
+++ b/local.mk
@@ -5,7 +5,6 @@ endif
 dist-files += configure config.h.in nix.spec
 
 GLOBAL_CXXFLAGS += -I . -I src -I src/libutil -I src/libstore -I src/libmain 
-I src/libexpr
-GLOBAL_LDFLAGS += -pthread
 
 $(foreach i, config.h $(call rwildcard, src/lib*, *.hh), $(eval $(call 
install-file-in, $(i), $(includedir)/nix, 0644)))
 
diff --git a/src/nix-daemon/local.mk b/src/nix-daemon/local.mk
index bab84e7..e5538ba 100644
--- a/src/nix-daemon/local.mk
+++ b/src/nix-daemon/local.mk
@@ -6,6 +6,8 @@ nix-daemon_SOURCES := $(d)/nix-daemon.cc
 
 nix-daemon_LIBS = libmain libstore libutil libformat
 
+nix-daemon_LDFLAGS = -pthread
+
 ifeq ($(OS), SunOS)
         nix-daemon_LDFLAGS += -lsocket
 endif
diff --git a/src/nix-store/local.mk b/src/nix-store/local.mk
index dc049f3..b887fe0 100644
--- a/src/nix-store/local.mk
+++ b/src/nix-store/local.mk
@@ -6,6 +6,6 @@ nix-store_SOURCES := $(wildcard $(d)/*.cc)
 
 nix-store_LIBS = libmain libstore libutil libformat
 
-nix-store_LDFLAGS = -lbz2
+nix-store_LDFLAGS = -lbz2 -pthread
 
 nix-store_CXXFLAGS = -DCURL=\"$(curl)\"