aboutsummaryrefslogtreecommitdiff
path: root/src/nix-channel
diff options
context:
space:
mode:
authorAndrew Dunham <andrew@du.nham.ca>2018-04-21 21:10:52 -0700
committerAndrew Dunham <andrew@du.nham.ca>2018-04-21 21:10:52 -0700
commit3a918014b248a41fe6307228d258b6113e84138b (patch)
tree67da83bb97db1741da4afcbe9cb1322a7d3fdebf /src/nix-channel
parent040acdcee2fcf5647896ba12316b4f9184275a70 (diff)
Fix library ordering in Makefiles
The existing ordering linked `libutil` before `libstore`, which causes link failures when building statically. This is due to `libstore` using functions from `libutil`, and the fact that symbol resolution works "forward" - i.e. if you pass `-lfoo -lbar -lbaz`, any symbols that `libbar` uses from `libbaz` will be resolved, but symbols from `libfoo` will not since it comes first in the command line. All this to say: this commit reorders the libraries which fixes the link errors.
Diffstat (limited to 'src/nix-channel')
-rw-r--r--src/nix-channel/local.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nix-channel/local.mk b/src/nix-channel/local.mk
index 49fc105c6..c14e8c359 100644
--- a/src/nix-channel/local.mk
+++ b/src/nix-channel/local.mk
@@ -2,6 +2,6 @@ programs += nix-channel
nix-channel_DIR := $(d)
-nix-channel_LIBS = libmain libutil libformat libstore
+nix-channel_LIBS = libmain libformat libstore libutil
nix-channel_SOURCES := $(d)/nix-channel.cc