diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-03-31 14:13:32 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-03-31 14:13:32 +0200 |
| commit | c0745a2531f67f741ea9a5472e523a28ddc02be7 (patch) | |
| tree | cbf9e67c1b51060015e8998053b9c86eba28585e /perl/local.mk | |
| parent | c60715e937e3773bbb8a114fc9b9c6577f8c5cb5 (diff) | |
| parent | a75475ca611fbc9074792a30740d19fd3a3a6cf7 (diff) | |
Merge branch 'remove-perl' of https://github.com/shlevy/nix
Diffstat (limited to 'perl/local.mk')
| -rw-r--r-- | perl/local.mk | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/perl/local.mk b/perl/local.mk index 5b43c4b71..1793ececf 100644 --- a/perl/local.mk +++ b/perl/local.mk @@ -1,10 +1,10 @@ nix_perl_sources := \ - $(d)/lib/Nix/Store.pm \ - $(d)/lib/Nix/Manifest.pm \ - $(d)/lib/Nix/SSH.pm \ - $(d)/lib/Nix/CopyClosure.pm \ - $(d)/lib/Nix/Config.pm.in \ - $(d)/lib/Nix/Utils.pm + lib/Nix/Store.pm \ + lib/Nix/Manifest.pm \ + lib/Nix/SSH.pm \ + lib/Nix/CopyClosure.pm \ + lib/Nix/Config.pm.in \ + lib/Nix/Utils.pm nix_perl_modules := $(nix_perl_sources:.in=) @@ -12,12 +12,12 @@ $(foreach x, $(nix_perl_modules), $(eval $(call install-data-in, $(x), $(perllib ifeq ($(perlbindings), yes) - $(d)/lib/Nix/Store.cc: $(d)/lib/Nix/Store.xs + lib/Nix/Store.cc: lib/Nix/Store.xs $(trace-gen) xsubpp $^ -output $@ libraries += Store - Store_DIR := $(d)/lib/Nix + Store_DIR := lib/Nix Store_SOURCES := $(Store_DIR)/Store.cc @@ -25,11 +25,10 @@ ifeq ($(perlbindings), yes) -I$(shell $(perl) -e 'use Config; print $$Config{archlibexp};')/CORE \ -D_FILE_OFFSET_BITS=64 \ -Wno-unknown-warning-option -Wno-unused-variable -Wno-literal-suffix \ - -Wno-reserved-user-defined-literal -Wno-duplicate-decl-specifier -Wno-pointer-bool-conversion + -Wno-reserved-user-defined-literal -Wno-duplicate-decl-specifier -Wno-pointer-bool-conversion \ + $(NIX_CFLAGS) - Store_LIBS = libstore libutil - - Store_LDFLAGS := $(SODIUM_LIBS) + Store_LDFLAGS := $(SODIUM_LIBS) $(NIX_LIBS) ifeq (CYGWIN,$(findstring CYGWIN,$(OS))) archlib = $(shell perl -E 'use Config; print $$Config{archlib};') @@ -45,4 +44,4 @@ ifeq ($(perlbindings), yes) endif -clean-files += $(d)/lib/Nix/Config.pm $(d)/lib/Nix/Store.cc +clean-files += lib/Nix/Config.pm lib/Nix/Store.cc Makefile.config |