diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-23 19:48:18 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-23 19:48:18 +0200 |
| commit | bd91453bb146446e4763ea2dbc934dd271fe544b (patch) | |
| tree | 35ab9744b2919d98d14948e6e9f8ce4cd87780aa | |
| parent | ece531d1051e1e9e9bad586265d293c866a9c0ec (diff) | |
Pass -pthread only for programs that need it
| -rw-r--r-- | local.mk | 1 | ||||
| -rw-r--r-- | src/nix-daemon/local.mk | 2 | ||||
| -rw-r--r-- | src/nix-store/local.mk | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -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)\" |