diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-01-07 23:11:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-07 23:11:34 +0100 |
| commit | 85488a93ec3b07210339f2b05aa93e970f9ac3be (patch) | |
| tree | e0a96d79de043515dcc36198fec9aa60fccd6892 /src | |
| parent | ff342fc0c2be662dd9791ff32b4d6d63e35aa2e9 (diff) | |
| parent | 27332870466c971d9c9bbc4a0955c7882468e132 (diff) | |
Merge pull request #2612 from Ericson2314/remove-dead-dynlib_suffix
[Needs testing and review] Remove dead code
Diffstat (limited to 'src')
| -rw-r--r-- | src/libexpr/local.mk | 2 | ||||
| -rw-r--r-- | src/libmain/local.mk | 2 | ||||
| -rw-r--r-- | src/libstore/local.mk | 2 | ||||
| -rw-r--r-- | src/libutil/local.mk | 4 | ||||
| -rw-r--r-- | src/nix/local.mk | 2 | ||||
| -rw-r--r-- | src/resolve-system-dependencies/local.mk | 2 |
6 files changed, 5 insertions, 9 deletions
diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index daa3258f0..ccd5293e4 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -6,7 +6,7 @@ libexpr_DIR := $(d) libexpr_SOURCES := $(wildcard $(d)/*.cc) $(wildcard $(d)/primops/*.cc) $(d)/lexer-tab.cc $(d)/parser-tab.cc -libexpr_LIBS = libutil libstore libformat +libexpr_LIBS = libutil libstore libexpr_LDFLAGS = ifneq ($(OS), FreeBSD) diff --git a/src/libmain/local.mk b/src/libmain/local.mk index f1fd3eb72..0c80f5a0a 100644 --- a/src/libmain/local.mk +++ b/src/libmain/local.mk @@ -8,7 +8,7 @@ libmain_SOURCES := $(wildcard $(d)/*.cc) libmain_LDFLAGS = $(OPENSSL_LIBS) -libmain_LIBS = libstore libutil libformat +libmain_LIBS = libstore libutil libmain_ALLOW_UNDEFINED = 1 diff --git a/src/libstore/local.mk b/src/libstore/local.mk index 3799257f8..89fc918c3 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -6,7 +6,7 @@ libstore_DIR := $(d) libstore_SOURCES := $(wildcard $(d)/*.cc $(d)/builtins/*.cc) -libstore_LIBS = libutil libformat +libstore_LIBS = libutil libstore_LDFLAGS = $(SQLITE3_LIBS) -lbz2 $(LIBCURL_LIBS) $(SODIUM_LIBS) -pthread ifneq ($(OS), FreeBSD) diff --git a/src/libutil/local.mk b/src/libutil/local.mk index 824f48fbf..3ccc23fd5 100644 --- a/src/libutil/local.mk +++ b/src/libutil/local.mk @@ -7,7 +7,3 @@ libutil_DIR := $(d) libutil_SOURCES := $(wildcard $(d)/*.cc) libutil_LDFLAGS = $(LIBLZMA_LIBS) -lbz2 -pthread $(OPENSSL_LIBS) $(LIBBROTLI_LIBS) -lboost_context - -libutil_LIBS = libformat - -libutil_CXXFLAGS = -DBROTLI=\"$(brotli)\" diff --git a/src/nix/local.mk b/src/nix/local.mk index 40a0e8d6b..ca4604d56 100644 --- a/src/nix/local.mk +++ b/src/nix/local.mk @@ -15,7 +15,7 @@ nix_SOURCES := \ $(wildcard src/nix-prefetch-url/*.cc) \ $(wildcard src/nix-store/*.cc) \ -nix_LIBS = libexpr libmain libstore libutil libformat +nix_LIBS = libexpr libmain libstore libutil nix_LDFLAGS = -pthread $(SODIUM_LIBS) $(EDITLINE_LIBS) diff --git a/src/resolve-system-dependencies/local.mk b/src/resolve-system-dependencies/local.mk index 8792a4a25..f9db16268 100644 --- a/src/resolve-system-dependencies/local.mk +++ b/src/resolve-system-dependencies/local.mk @@ -6,6 +6,6 @@ resolve-system-dependencies_DIR := $(d) resolve-system-dependencies_INSTALL_DIR := $(libexecdir)/nix -resolve-system-dependencies_LIBS := libstore libmain libutil libformat +resolve-system-dependencies_LIBS := libstore libmain libutil resolve-system-dependencies_SOURCES := $(d)/resolve-system-dependencies.cc |