mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-22 05:56:15 +02:00
Use libnix as a prefix for all Nix libraries
In particular "libutil" was always a problem because it collides with Glibc's libutil. Even if we install into $(libdir)/nix, the linker sometimes got confused (e.g. if a program links against libstore but not libutil, then ld would report undefined symbols in libstore because it was looking at Glibc's libutil).
This commit is contained in:
parent
f267ff16b4
commit
2bd0fcc966
5 changed files with 10 additions and 0 deletions
|
@ -1,5 +1,7 @@
|
||||||
LIBS += libformat
|
LIBS += libformat
|
||||||
|
|
||||||
|
libformat_NAME = libnixformat
|
||||||
|
|
||||||
libformat_DIR := $(d)
|
libformat_DIR := $(d)
|
||||||
|
|
||||||
libformat_SOURCES = format_implementation.cc free_funcs.cc parsing.cc
|
libformat_SOURCES = format_implementation.cc free_funcs.cc parsing.cc
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
LIBS += libexpr
|
LIBS += libexpr
|
||||||
|
|
||||||
|
libexpr_NAME = libnixexpr
|
||||||
|
|
||||||
libexpr_DIR := $(d)
|
libexpr_DIR := $(d)
|
||||||
|
|
||||||
libexpr_SOURCES = \
|
libexpr_SOURCES = \
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
LIBS += libmain
|
LIBS += libmain
|
||||||
|
|
||||||
|
libmain_NAME = libnixmain
|
||||||
|
|
||||||
libmain_DIR := $(d)
|
libmain_DIR := $(d)
|
||||||
|
|
||||||
libmain_SOURCES = shared.cc stack.cc
|
libmain_SOURCES = shared.cc stack.cc
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
LIBS += libstore
|
LIBS += libstore
|
||||||
|
|
||||||
|
libstore_NAME = libnixstore
|
||||||
|
|
||||||
libstore_DIR := $(d)
|
libstore_DIR := $(d)
|
||||||
|
|
||||||
libstore_SOURCES = \
|
libstore_SOURCES = \
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
LIBS += libutil
|
LIBS += libutil
|
||||||
|
|
||||||
|
libutil_NAME = libnixutil
|
||||||
|
|
||||||
libutil_DIR := $(d)
|
libutil_DIR := $(d)
|
||||||
|
|
||||||
libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc
|
libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc
|
||||||
|
|
Loading…
Reference in a new issue