diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-22T20·56+0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-22T20·56+0000 |
| commit | 6dd74b48f8d587fcc215e9f4721eacace7f8f462 (patch) | |
| tree | 77f7f80e43f4f1de5d38d1351638c2eb0bf5e1b2 /src | |
| parent | 9b11a8bfbcfd9e6f40ae8b573d4de492a23b91b9 (diff) | |
Support building dynamic libraries
Diffstat (limited to 'src')
| -rw-r--r-- | src/libmain/Makefile.new | 2 | ||||
| -rw-r--r-- | src/libutil/Makefile.new | 4 | ||||
| -rw-r--r-- | src/nix-store/Makefile.new | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/libmain/Makefile.new b/src/libmain/Makefile.new index 9e26aa8b9e53..eed7e84afe18 100644 --- a/src/libmain/Makefile.new +++ b/src/libmain/Makefile.new @@ -4,4 +4,4 @@ libmain_DIR := $(d) libmain_SOURCES = shared.cc stack.cc -libmain_LDFLAGS = $(BDW_GC_LIBS) +libmain_LDFLAGS_PROPAGATED = $(BDW_GC_LIBS) diff --git a/src/libutil/Makefile.new b/src/libutil/Makefile.new index 7871a4ddb8c8..b7dbf7d1d21e 100644 --- a/src/libutil/Makefile.new +++ b/src/libutil/Makefile.new @@ -5,9 +5,9 @@ libutil_DIR := $(d) libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc ifeq ($(HAVE_OPENSSL), 1) -libutil_LDFLAGS = $(OPENSSL_LIBS) + libutil_LDFLAGS = $(OPENSSL_LIBS) else -libutil_SOURCES += md5.c sha1.c sha256.c + libutil_SOURCES += md5.c sha1.c sha256.c endif libutil_LIBS = src/boost/format/libformat diff --git a/src/nix-store/Makefile.new b/src/nix-store/Makefile.new index 0b31f3a36735..105513872e81 100644 --- a/src/nix-store/Makefile.new +++ b/src/nix-store/Makefile.new @@ -5,3 +5,5 @@ nix-store_DIR := $(d) nix-store_SOURCES = nix-store.cc dotgraph.cc xmlgraph.cc nix-store_LIBS = libmain libstore libutil libformat + +nix-store_LDFLAGS = -lbz2 |