diff options
| author | Robin Gloster <mail@glob.in> | 2017-01-27 20:12:54 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-01-27 20:12:54 +0100 |
| commit | c67805ff17d4cedaa5fe9b159fd32a01bc81d5bc (patch) | |
| tree | 33d537418c6a473a2936114ad9b723b45f75e9ac /pkgs/development/compilers/coreclr | |
| parent | edef570ad722c5626536ce5d70be645186f78ba0 (diff) | |
| download | nixlib-c67805ff17d4cedaa5fe9b159fd32a01bc81d5bc.tar nixlib-c67805ff17d4cedaa5fe9b159fd32a01bc81d5bc.tar.gz nixlib-c67805ff17d4cedaa5fe9b159fd32a01bc81d5bc.tar.bz2 nixlib-c67805ff17d4cedaa5fe9b159fd32a01bc81d5bc.tar.lz nixlib-c67805ff17d4cedaa5fe9b159fd32a01bc81d5bc.tar.xz nixlib-c67805ff17d4cedaa5fe9b159fd32a01bc81d5bc.tar.zst nixlib-c67805ff17d4cedaa5fe9b159fd32a01bc81d5bc.zip | |
llvmPackages_36: remove
Diffstat (limited to 'pkgs/development/compilers/coreclr')
| -rw-r--r-- | pkgs/development/compilers/coreclr/default.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 7799cab76a64..558cfa35adad 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -2,8 +2,8 @@ , fetchFromGitHub , which , cmake -, clang_35 -, llvmPackages_36 +, clang +, llvmPackages , libunwind , gettext , openssl @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { buildInputs = [ which cmake - clang_35 - llvmPackages_36.llvm - llvmPackages_36.lldb + clang + llvmPackages.llvm + llvmPackages.lldb libunwind gettext openssl @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { configurePhase = '' # Prevent clang-3.5 (rather than just clang) from being selected as the compiler as that's # not wrapped - substituteInPlace src/pal/tools/gen-buildsys-clang.sh --replace "which \"clang-\$" "which \"clang-DoNotFindThisOne\$" + # substituteInPlace src/pal/tools/gen-buildsys-clang.sh --replace "which \"clang-\$" "which \"clang-DoNotFindThisOne\$" patchShebangs build.sh patchShebangs src/pal/tools/gen-buildsys-clang.sh @@ -67,7 +67,10 @@ stdenv.mkDerivation rec { BuildType = if debug then "Debug" else "Release"; hardeningDisable = [ "strictoverflow" "format" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=unused-result" "-Wno-error=delete-non-virtual-dtor" + "-Wno-error=null-dereference" + ]; buildPhase = '' ./build.sh $BuildArch $BuildType |