From bd91453bb146446e4763ea2dbc934dd271fe544b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Jul 2014 19:48:18 +0200
Subject: [PATCH] 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 cb628fac6..6361e1872 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 bab84e7ad..e5538bada 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 dc049f348..b887fe033 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)\"