Pass -pthread only for programs that need it

This commit is contained in:
Eelco Dolstra 2014-07-23 19:48:18 +02:00
parent ece531d105
commit bd91453bb1
3 changed files with 3 additions and 2 deletions

View file

@ -5,7 +5,6 @@ endif
dist-files += configure config.h.in nix.spec 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_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))) $(foreach i, config.h $(call rwildcard, src/lib*, *.hh), $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644)))

View file

@ -6,6 +6,8 @@ nix-daemon_SOURCES := $(d)/nix-daemon.cc
nix-daemon_LIBS = libmain libstore libutil libformat nix-daemon_LIBS = libmain libstore libutil libformat
nix-daemon_LDFLAGS = -pthread
ifeq ($(OS), SunOS) ifeq ($(OS), SunOS)
nix-daemon_LDFLAGS += -lsocket nix-daemon_LDFLAGS += -lsocket
endif endif

View file

@ -6,6 +6,6 @@ nix-store_SOURCES := $(wildcard $(d)/*.cc)
nix-store_LIBS = libmain libstore libutil libformat nix-store_LIBS = libmain libstore libutil libformat
nix-store_LDFLAGS = -lbz2 nix-store_LDFLAGS = -lbz2 -pthread
nix-store_CXXFLAGS = -DCURL=\"$(curl)\" nix-store_CXXFLAGS = -DCURL=\"$(curl)\"