[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
78/376: Pass -pthread only for programs that need it
From: |
Ludovic Courtès |
Subject: |
78/376: Pass -pthread only for programs that need it |
Date: |
Wed, 28 Jan 2015 22:04:10 +0000 |
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)\"
- 75/376: nix-store --serve: Monitor for client disconnects, (continued)
- 75/376: nix-store --serve: Monitor for client disconnects, Ludovic Courtès, 2015/01/28
- 70/376: Better fix for strcasecmp on Darwin, Ludovic Courtès, 2015/01/28
- 73/376: startProcess: Make writing error messages from the child more robust, Ludovic Courtès, 2015/01/28
- 67/376: nix-daemon: Add trusted-users and allowed-users options, Ludovic Courtès, 2015/01/28
- 56/376: Remove cruft, Ludovic Courtès, 2015/01/28
- 76/376: nix-daemon: Simplify stderr handling, Ludovic Courtès, 2015/01/28
- 71/376: Revert old useBuildHook behaviour, Ludovic Courtès, 2015/01/28
- 65/376: nix-daemon: Only print connection info if we have SO_PEERCRED, Ludovic Courtès, 2015/01/28
- 69/376: Bump, Ludovic Courtès, 2015/01/28
- 62/376: Be more strict about file names in NARs, Ludovic Courtès, 2015/01/28
- 78/376: Pass -pthread only for programs that need it,
Ludovic Courtès <=
- 80/376: Remove some dead code, Ludovic Courtès, 2015/01/28
- 72/376: Remove dead code, Ludovic Courtès, 2015/01/28
- 81/376: Add some assertions, Ludovic Courtès, 2015/01/28
- 82/376: More debugging, Ludovic Courtès, 2015/01/28
- 85/376: tests/remote-builds.nix: Don't try cache.nixos.org, Ludovic Courtès, 2015/01/28
- 79/376: Remove some obsolete files, Ludovic Courtès, 2015/01/28
- 83/376: Fix bogus pass by reference, Ludovic Courtès, 2015/01/28
- 88/376: Refactor, Ludovic Courtès, 2015/01/28
- 87/376: tests/remote-builds.nix: Test failing build, Ludovic Courtès, 2015/01/28
- 89/376: build-remote.pl: Be less verbose on failing builds, Ludovic Courtès, 2015/01/28