[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
372/376: Merge branch 'cygwin-master' of https://github.com/ternaris/nix
From: |
Ludovic Courtès |
Subject: |
372/376: Merge branch 'cygwin-master' of https://github.com/ternaris/nix |
Date: |
Wed, 28 Jan 2015 22:06:16 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit 8bdff8c1003501bab0dbc63ed6c391ff2f2da4b5
Merge: 14955c2 f665c5d
Author: Eelco Dolstra <address@hidden>
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 :=
- 359/376: Better error message, (continued)
- 359/376: Better error message, Ludovic Courtès, 2015/01/28
- 362/376: Undocument nix-generate-patches, Ludovic Courtès, 2015/01/28
- 367/376: Fix image in PDF, Ludovic Courtès, 2015/01/28
- 354/376: Ensure we're writing to stderr in the builder, Ludovic Courtès, 2015/01/28
- 360/376: Style, Ludovic Courtès, 2015/01/28
- 365/376: Update .nixpkg description, Ludovic Courtès, 2015/01/28
- 366/376: Rename files, Ludovic Courtès, 2015/01/28
- 371/376: Merge commit '36c67860363c93eb00cf5b8e2ad34f6f775e6901', Ludovic Courtès, 2015/01/28
- 363/376: Style, Ludovic Courtès, 2015/01/28
- 376/376: Grmbl, Ludovic Courtès, 2015/01/28
- 372/376: Merge branch 'cygwin-master' of https://github.com/ternaris/nix,
Ludovic Courtès <=
- 364/376: ReiserFS -> ext4, Ludovic Courtès, 2015/01/28
- 375/376: Add a section on nix-serve, Ludovic Courtès, 2015/01/28
- 361/376: Document channel format and excise most mentions of manifests and nix-pull, Ludovic Courtès, 2015/01/28
- 370/376: Delete the stdenv section, Ludovic Courtès, 2015/01/28
- 374/376: Add section on SSH substituter, Ludovic Courtès, 2015/01/28
- 373/376: Pedantry, Ludovic Courtès, 2015/01/28
- 368/376: Fix build, Ludovic Courtès, 2015/01/28
- 369/376: Bla, Ludovic Courtès, 2015/01/28
- 294/376: Clean up temp roots in a more C++ way, Ludovic Courtès, 2015/01/28
- 287/376: Don't use ADDR_LIMIT_3GB, Ludovic Courtès, 2015/01/28