diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-13 16:08:36 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-13 16:08:36 -0500 |
| commit | 7ef4448c97a8f13f0bd18bb67a84919121b941ea (patch) | |
| tree | bae7bbf73a4f08bb11a3b355da6a91a2d0a5a158 /pkgs/top-level | |
| parent | 26a5612aebd10668e10a67ad54092a2690ffa281 (diff) | |
| parent | 9d8f9b2e531bf95a700a949d879927fb6996ffc9 (diff) | |
| download | nixlib-7ef4448c97a8f13f0bd18bb67a84919121b941ea.tar nixlib-7ef4448c97a8f13f0bd18bb67a84919121b941ea.tar.gz nixlib-7ef4448c97a8f13f0bd18bb67a84919121b941ea.tar.bz2 nixlib-7ef4448c97a8f13f0bd18bb67a84919121b941ea.tar.lz nixlib-7ef4448c97a8f13f0bd18bb67a84919121b941ea.tar.xz nixlib-7ef4448c97a8f13f0bd18bb67a84919121b941ea.tar.zst nixlib-7ef4448c97a8f13f0bd18bb67a84919121b941ea.zip | |
Merge commit '9d8f9b2e531bf95a700a949d879927fb6996ffc9' into binutils-wrapper
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 2 |
2 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e90f94ab580..ed9447598713 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1639,6 +1639,7 @@ with pkgs; idnSupport = true; ldapSupport = true; gssSupport = true; + brotliSupport = true; }; curl = callPackage ../tools/networking/curl rec { @@ -5585,7 +5586,20 @@ with pkgs; ''; }) else throw "Multilib ${cc.name} not supported on ‘${system}’"; + wrapClangMulti = clang: + if system == "x86_64-linux" then + callPackages ../development/compilers/llvm/multi.nix { + inherit clang; + gcc32 = pkgsi686Linux.gcc; + gcc64 = pkgs.gcc; + } + else throw "Multilib ${clang.cc.name} not supported on '${system}'"; + gcc_multi = wrapCCMulti gcc; + clang_multi = wrapClangMulti clang; + + gccMultiStdenv = overrideCC stdenv gcc_multi; + clangMultiStdenv = overrideCC stdenv clang_multi; gcc_debug = lowPrio (wrapCC (gcc.cc.override { stripped = false; @@ -20077,6 +20091,9 @@ with pkgs; cc-wrapper-libcxx-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; }; stdenv-inputs = callPackage ../test/stdenv-inputs { }; + cc-multilib-gcc = callPackage ../test/cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; + cc-multilib-clang = callPackage ../test/cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; + macOSSierraShared = callPackage ../test/macos-sierra-shared {}; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 8cbb7063b4eb..201c3a38cf8b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -112,6 +112,8 @@ let jobs.tests.cc-wrapper-clang-39.x86_64-darwin jobs.tests.cc-wrapper-libcxx-39.x86_64-linux jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin + jobs.tests.cc-multilib-gcc.x86_64-linux + jobs.tests.cc-multilib-clang.x86_64-linux jobs.tests.stdenv-inputs.x86_64-linux jobs.tests.stdenv-inputs.x86_64-darwin jobs.tests.macOSSierraShared.x86_64-darwin |