diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-16 12:53:30 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-17 10:41:06 +0200 |
| commit | 604b0c86bf402039f5d7e7b969153df42ee02c57 (patch) | |
| tree | 1bcb85947b96ace634bdaa07f9870e42fa387b07 /pkgs/development/libraries/boost | |
| parent | 4cf524e588c28f7a6965ed310c4f2a46f05edbc2 (diff) | |
boost: fix build on mingw after b465dc202f0b
We passed bogus --libdir even in standard native builds;
apparently it wasn't a problem, but I also fixed that.
Diffstat (limited to 'pkgs/development/libraries/boost')
| -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 73499a424978..335bc1b68c67 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -100,7 +100,7 @@ let commonConfigureFlags = [ "--includedir=$(dev)/include" - "--libdir=$(lib)/lib" + "--libdir=$(out)/lib" ]; fixup = '' @@ -111,7 +111,7 @@ let -exec sed '1i#line 1 "{}"' -i '{}' \; ) '' + optionalString (stdenv.cross.libc or null == "msvcrt") '' - ${stdenv.cross.config}-ranlib "$lib"/lib/*.a + ${stdenv.cross.config}-ranlib "$out"/lib/*.a ''; in |