From f7bf249b2be4845a3b758d1271e836020a33ea2f Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Tue, 8 Mar 2016 10:04:04 +0000 Subject: boost: Fix compilation for static builds. The 'runtime-link=' feature must not be set in addition to 'link=' for boost-1.55 when building only the statically linked libraries. Fixes errors that targets were defined multiple times. --- pkgs/development/libraries/boost/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 90e60d59da0c..b28668e7b301 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -58,7 +58,7 @@ let "--layout=${layout}" "variant=${variant}" "threading=${threading}" - "runtime-link=${runtime-link}" + ] ++ optional (link != "static") "runtime-link=${runtime-link}" ++ [ "link=${link}" "${cflags}" ] ++ optional (variant == "release") "debug-symbols=off"; -- cgit 1.4.1