From cbc177ca013ff9d87b36074eab9de6261f37bdaf Mon Sep 17 00:00:00 2001 From: Manuel Jacob Date: Fri, 2 Oct 2015 13:36:27 +0200 Subject: Use pkg-config-provided LDFLAGS for libsqlite3 and libcurl. Previously, pkg-config was already queried for libsqlite3's and libcurl's link flags. However they were not used, but hardcoded instead. This commit replaces the hardcoded LDFLAGS by the ones provided by pkg-config in a similar pattern as already used for libsodium. --- src/libstore/local.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libstore') diff --git a/src/libstore/local.mk b/src/libstore/local.mk index bf5c256c949e..08460dceb888 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -8,7 +8,7 @@ libstore_SOURCES := $(wildcard $(d)/*.cc) libstore_LIBS = libutil libformat -libstore_LDFLAGS = -lsqlite3 -lbz2 -lcurl +libstore_LDFLAGS = $(SQLITE3_LIBS) -lbz2 $(LIBCURL_LIBS) ifeq ($(OS), SunOS) libstore_LDFLAGS += -lsocket -- cgit 1.4.1 From 8a74a125bc3ac7a8273b8a1be8f0774a664900af Mon Sep 17 00:00:00 2001 From: janus Date: Tue, 17 Nov 2015 14:16:08 +0000 Subject: FreeBSD can build Linux 32-bit binaries --- src/libstore/build.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/libstore') diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 3adad662d072..4809a5a57808 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -1251,6 +1251,8 @@ static bool canBuildLocally(const string & platform) #if __linux__ || (platform == "i686-linux" && settings.thisSystem == "x86_64-linux") #endif + || (platform == "i686-linux" && settings.thisSystem == "x86_64-freebsd") + || (platform == "i686-linux" && settings.thisSystem == "i686-freebsd") ; } -- cgit 1.4.1