boost: Fix static library builds. (link=static and runtime-link=static together breaks Boost's build scripts.)

6 years ago · c1127b95ce
parent 629d121980
commit c1127b95ce
1 changed files with 2 additions and 2 deletions
--- 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") [