nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-19 08:49:35 +01:00
Code Activity

Merge pull request #5054 from alyssais/2.3-host_os

Browse source 
[2.3] Apply OS checks to host platform, not build
This commit is contained in:
Domen Kožar 2021-09-21 08:12:04 +02:00 • committed by GitHub
commit 8c5b39875e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 43 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/local.mk
View file

@ -9,7 +9,7 @@ libexpr_SOURCES := $(wildcard $(d)/*.cc) $(wildcard $(d)/primops/*.cc) $(d)/lexe
libexpr_LIBS = libutil libstore
libexpr_LDFLAGS =
ifeq ($(OS), Linux)
ifdef HOST_LINUX
libexpr_LDFLAGS += -ldl
endif

4
src/libstore/local.mk
View file

@ -9,7 +9,7 @@ libstore_SOURCES := $(wildcard $(d)/*.cc $(d)/builtins/*.cc)
libstore_LIBS = libutil
libstore_LDFLAGS = $(SQLITE3_LIBS) -lbz2 $(LIBCURL_LIBS) $(SODIUM_LIBS) -pthread
ifeq ($(OS), Linux)
ifdef HOST_LINUX
libstore_LDFLAGS += -ldl
endif
@ -21,7 +21,7 @@ ifeq ($(ENABLE_S3), 1)
libstore_LDFLAGS += -laws-cpp-sdk-transfer -laws-cpp-sdk-s3 -laws-cpp-sdk-core
endif
ifeq ($(OS), SunOS)
ifdef HOST_SOLARIS
libstore_LDFLAGS += -lsocket
endif

2
src/resolve-system-dependencies/local.mk
View file

@ -1,4 +1,4 @@
ifeq ($(OS), Darwin)
ifdef HOST_DARWIN
programs += resolve-system-dependencies
endif