diff options
| author | tkatchev <tkatchev@gmail.com> | 2018-03-22 15:45:39 +0300 |
|---|---|---|
| committer | tkatchev <tkatchev@gmail.com> | 2018-03-22 15:51:23 +0300 |
| commit | c1127b95ceeaf07ca9c345b687b1b4ecddbc0572 (patch) | |
| tree | 321b8e4b151559536e481900081fc0bb4b477f84 /pkgs/development/libraries/boost/generic.nix | |
| parent | 629d1219805b9344984c11c0cc9c626f9d2271cb (diff) | |
| download | nixpkgs-c1127b95ceeaf07ca9c345b687b1b4ecddbc0572.tar nixpkgs-c1127b95ceeaf07ca9c345b687b1b4ecddbc0572.tar.gz nixpkgs-c1127b95ceeaf07ca9c345b687b1b4ecddbc0572.tar.bz2 nixpkgs-c1127b95ceeaf07ca9c345b687b1b4ecddbc0572.tar.lz nixpkgs-c1127b95ceeaf07ca9c345b687b1b4ecddbc0572.tar.xz nixpkgs-c1127b95ceeaf07ca9c345b687b1b4ecddbc0572.tar.zst nixpkgs-c1127b95ceeaf07ca9c345b687b1b4ecddbc0572.zip | |
boost: Fix static library builds. (link=static and runtime-link=static together breaks Boost's build scripts.)
Diffstat (limited to 'pkgs/development/libraries/boost/generic.nix')
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 14ea512afbd..efe1151359d 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -55,11 +55,11 @@ let "--layout=${layout}" "variant=${variant}" "threading=${threading}" - "runtime-link=${runtime-link}" "link=${link}" "-sEXPAT_INCLUDE=${expat.dev}/include" "-sEXPAT_LIBPATH=${expat.out}/lib" - ] ++ optional (variant == "release") "debug-symbols=off" + ] ++ optional (link != "static") "runtime-link=${runtime-link}" + ++ optional (variant == "release") "debug-symbols=off" ++ optional (toolset != null) "toolset=${toolset}" ++ optional (mpi != null || hostPlatform != buildPlatform) "--user-config=user-config.jam" ++ optionals (hostPlatform.libc == "msvcrt") [ |