diff options
| -rw-r--r-- | pkgs/development/libraries/boost/1.40.0.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/boost/1.40.0.nix b/pkgs/development/libraries/boost/1.40.0.nix index 0ae1470178c6..e67af56a3624 100644 --- a/pkgs/development/libraries/boost/1.40.0.nix +++ b/pkgs/development/libraries/boost/1.40.0.nix @@ -21,6 +21,12 @@ let (stdenv.lib.optional enableShared "shared" ++ stdenv.lib.optional enableStatic "static"); + # To avoid library name collisions + finalLayout = if ((enableRelease && enableDebug) || + (enableSingleThreaded && enableMultiThreaded) || + (enableShared && enableStatic)) then + "system" else "tagged"; + in stdenv.mkDerivation { @@ -42,7 +48,7 @@ stdenv.mkDerivation { configureScript = "./bootstrap.sh"; configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; - buildPhase = "./bjam -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=${variant} threading=${threading} link=${link} install"; + buildPhase = "./bjam -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} install"; installPhase = ":"; } |