3
0
Fork 0
forked from mirrors/nixpkgs

foundationdb: no clang, use default gcc

These options should be experimental, and I'm keeping them off for now.
This also avoids any ABI concerns between libraries, too.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2019-10-29 15:26:20 -05:00
parent 462d2b73c2
commit 53a7ae0185
No known key found for this signature in database
GPG key ID: 25D2038DEB08021D
2 changed files with 4 additions and 4 deletions

View file

@ -4,7 +4,7 @@
, cmake, ninja, boost, python3, openjdk, mono, libressl
, gccStdenv, llvmPackages
, useClang ? true
, useClang ? false
, ...
}:

View file

@ -1,4 +1,4 @@
{ stdenv, stdenv49, gcc9Stdenv, llvmPackages_8
{ stdenv, stdenv49, gccStdenv, llvmPackages
, lib, fetchurl, fetchpatch, fetchFromGitHub
, cmake, ninja, which, findutils, m4, gawk
@ -8,8 +8,8 @@
let
vsmakeBuild = import ./vsmake.nix args;
cmakeBuild = import ./cmake.nix (args // {
gccStdenv = gcc9Stdenv;
llvmPackages = llvmPackages_8;
gccStdenv = gccStdenv;
llvmPackages = llvmPackages;
});
python3-six-patch = fetchpatch {