guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

12/64: Fix compile errors on Illumos


From: Ludovic Courtès
Subject: 12/64: Fix compile errors on Illumos
Date: Mon, 05 Jan 2015 16:38:52 +0000

civodul pushed a commit to branch nix
in repository guix.

commit ae6b631dc48f4b923a6ed17b8d6e59524c4ea883
Author: Danny Wilson <address@hidden>
Date:   Thu Apr 3 16:59:25 2014 +0200

    Fix compile errors on Illumos
---
 src/libstore/build.cc   |    1 +
 src/libstore/local.mk   |    4 ++++
 src/nix-daemon/local.mk |    4 ++++
 3 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 2e2f92f..f38cd29 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -13,6 +13,7 @@
 #include <sstream>
 #include <algorithm>
 
+#include <limits.h>
 #include <time.h>
 #include <sys/time.h>
 #include <sys/wait.h>
diff --git a/src/libstore/local.mk b/src/libstore/local.mk
index 2dddce7..40cb25d 100644
--- a/src/libstore/local.mk
+++ b/src/libstore/local.mk
@@ -10,6 +10,10 @@ libstore_LIBS = libutil libformat
 
 libstore_LDFLAGS = -lsqlite3 -lbz2
 
+ifeq ($(OS), SunOS)
+       libstore_LDFLAGS += -lsocket
+endif
+
 libstore_CXXFLAGS = \
  -DNIX_STORE_DIR=\"$(storedir)\" \
  -DNIX_DATA_DIR=\"$(datadir)\" \
diff --git a/src/nix-daemon/local.mk b/src/nix-daemon/local.mk
index db071a3..bab84e7 100644
--- a/src/nix-daemon/local.mk
+++ b/src/nix-daemon/local.mk
@@ -6,4 +6,8 @@ nix-daemon_SOURCES := $(d)/nix-daemon.cc
 
 nix-daemon_LIBS = libmain libstore libutil libformat
 
+ifeq ($(OS), SunOS)
+        nix-daemon_LDFLAGS += -lsocket
+endif
+
 $(eval $(call install-symlink, nix-daemon, $(bindir)/nix-worker))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]