diff options
| author | Michael Raitza <spacefrogg-github@meterriblecrew.net> | 2016-03-08 10:04:04 +0000 |
|---|---|---|
| committer | Michael Raitza <spacefrogg-github@meterriblecrew.net> | 2016-03-08 10:04:04 +0000 |
| commit | f7bf249b2be4845a3b758d1271e836020a33ea2f (patch) | |
| tree | f006bc49c6cc6e2f9fe7384e0aa5bf9783993df9 /pkgs/development/libraries/boost/generic.nix | |
| parent | 0bf8a1a86df67649893726d50761567121330006 (diff) | |
| download | nixpkgs-f7bf249b2be4845a3b758d1271e836020a33ea2f.tar nixpkgs-f7bf249b2be4845a3b758d1271e836020a33ea2f.tar.gz nixpkgs-f7bf249b2be4845a3b758d1271e836020a33ea2f.tar.bz2 nixpkgs-f7bf249b2be4845a3b758d1271e836020a33ea2f.tar.lz nixpkgs-f7bf249b2be4845a3b758d1271e836020a33ea2f.tar.xz nixpkgs-f7bf249b2be4845a3b758d1271e836020a33ea2f.tar.zst nixpkgs-f7bf249b2be4845a3b758d1271e836020a33ea2f.zip | |
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.
Diffstat (limited to 'pkgs/development/libraries/boost/generic.nix')
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 90e60d59da0..b28668e7b30 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"; |