diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-23 13:38:29 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-23 13:40:18 -0400 |
| commit | 798ad38c35cabd845241d120553b9cdf2c150b41 (patch) | |
| tree | 6a9980ee1e01c0d216ff22580ea8a7fe2058cd7e | |
| parent | 7997c2ad4c49e90711ee537a57f90534941b2205 (diff) | |
| download | nixpkgs-798ad38c35cabd845241d120553b9cdf2c150b41.tar nixpkgs-798ad38c35cabd845241d120553b9cdf2c150b41.tar.gz nixpkgs-798ad38c35cabd845241d120553b9cdf2c150b41.tar.bz2 nixpkgs-798ad38c35cabd845241d120553b9cdf2c150b41.tar.lz nixpkgs-798ad38c35cabd845241d120553b9cdf2c150b41.tar.xz nixpkgs-798ad38c35cabd845241d120553b9cdf2c150b41.tar.zst nixpkgs-798ad38c35cabd845241d120553b9cdf2c150b41.zip | |
boost: use default toolset option
for 1.66 & 1.67 we were overriding the default toolset option. This meant that gcc-cross was not being selected properly, breaking the cross toolchain. /cc @dtzWill
| -rw-r--r-- | pkgs/development/libraries/boost/1.66.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/boost/1.67.nix | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix index 02cf511a6fd..932ebdcb463 100644 --- a/pkgs/development/libraries/boost/1.66.nix +++ b/pkgs/development/libraries/boost/1.66.nix @@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec { # SHA256 from http://www.boost.org/users/history/version_1_66_0.html sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; }; - - toolset = if stdenv.cc.isClang then "clang" else null; }) diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix index 2831104410b..8b9e7ccca7f 100644 --- a/pkgs/development/libraries/boost/1.67.nix +++ b/pkgs/development/libraries/boost/1.67.nix @@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec { # SHA256 from http://www.boost.org/users/history/version_1_66_0.html sha256 = "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba"; }; - - toolset = if stdenv.cc.isClang then "clang" else null; }) |