civodul pushed a commit to tag 1.8
in repository guix.
commit 8bdff8c1003501bab0dbc63ed6c391ff2f2da4b5
Merge: 14955c2 f665c5d
Author: Eelco Dolstra <[email protected]>
Date: Sun Dec 14 01:49:14 2014 +0100
Merge branch 'cygwin-master' of https://github.com/ternaris/nix
mk/lib.mk | 9 +++++++--
mk/libraries.mk | 16 +++++++++++++---
perl/local.mk | 6 ++++++
src/download-via-ssh/download-via-ssh.cc | 1 +
src/libmain/shared.cc | 1 +
src/libstore/optimise-store.cc | 1 +
src/libstore/remote-store.cc | 1 +
src/libutil/monitor-fd.hh | 1 +
8 files changed, 31 insertions(+), 5 deletions(-)
diff --cc mk/libraries.mk
index 766f7cc,3b292e9..3cd7a53
--- a/mk/libraries.mk
+++ b/mk/libraries.mk
@@@ -45,12 -49,16 +49,16 @@@ endi
# built, otherwise a static library.
define build-library
$(1)_NAME ?= $(1)
- _d := $$(strip $$($(1)_DIR))
+ _d := $(buildprefix)$$(strip $$($(1)_DIR))
_srcs := $$(sort $$(foreach src, $$($(1)_SOURCES), $$(src)))
- $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs)))
+ $(1)_OBJS := $$(addprefix $(buildprefix), $$(addsuffix .o, $$(basename
$$(_srcs))))
_libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH))
- $(1)_INSTALL_DIR ?= $$(libdir)
+ ifeq (CYGWIN,$(findstring CYGWIN,$(OS)))
+ $(1)_INSTALL_DIR ?= $$(bindir)
+ else
+ $(1)_INSTALL_DIR ?= $$(libdir)
+ endif
$(1)_LDFLAGS_USE :=
$(1)_LDFLAGS_USE_INSTALLED :=
