public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
tkatchev 2018-03-22 15:45:39 +03:00
parent 629d121980
commit c1127b95ce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/boost/generic.nix
View File

@ -55,11 +55,11 @@ let
"--layout=${layout}" "--layout=${layout}"
"variant=${variant}" "variant=${variant}"
"threading=${threading}" "threading=${threading}"
"runtime-link=${runtime-link}"
"link=${link}" "link=${link}"
"-sEXPAT_INCLUDE=${expat.dev}/include" "-sEXPAT_INCLUDE=${expat.dev}/include"
"-sEXPAT_LIBPATH=${expat.out}/lib" "-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 (toolset != null) "toolset=${toolset}"
++ optional (mpi != null || hostPlatform != buildPlatform) "--user-config=user-config.jam" ++ optional (mpi != null || hostPlatform != buildPlatform) "--user-config=user-config.jam"
++ optionals (hostPlatform.libc == "msvcrt") [ ++ optionals (hostPlatform.libc == "msvcrt") [