Merge pull request #224639 from NixOS/mozart/bump-llvm8

mozart: use llvmPackages_8 instead of llvmPackages_5

authored by Guillaume Maudoux and committed by GitHub c5e6843b 246567a3

-18
-18
pkgs/development/compilers/mozart/default.nix
··· 7 7 , boost169 8 8 , pinnedBoost ? boost169 9 9 , llvmPackages 10 - , llvmPackages_5 11 10 , gmp 12 11 , emacs 13 12 , jre_headless ··· 42 41 43 42 nativeBuildInputs = [ cmake makeWrapper unzip ]; 44 43 45 - # We cannot compile with both gcc and clang, but we need clang during the 46 - # process, so we compile everything with clang. 47 - # BUT, we need clang4 for parsing, and a more recent clang for compiling. 48 44 cmakeFlags = [ 49 - "-DCMAKE_CXX_COMPILER=${llvmPackages.clang}/bin/clang++" 50 - "-DCMAKE_C_COMPILER=${llvmPackages.clang}/bin/clang" 51 45 "-DBoost_USE_STATIC_LIBS=OFF" 52 46 "-DMOZART_BOOST_USE_STATIC_LIBS=OFF" 53 - "-DCMAKE_PROGRAM_PATH=${llvmPackages_5.clang}/bin" 54 - # Rationale: Nix's cc-wrapper needs to see a compile flag (like -c) to 55 - # infer that it is not a linking call, and stop trashing the command line 56 - # with linker flags. 57 - # As it does not recognise -emit-ast, we pass -c immediately overridden 58 - # by -emit-ast. 59 - # The remaining is just the default flags that we cannot reuse and need 60 - # to repeat here. 61 - "-DMOZART_GENERATOR_FLAGS='-c;-emit-ast;--std=c++0x;-Wno-invalid-noreturn;-Wno-return-type;-Wno-braced-scalar-init'" 62 47 # We are building with clang, as nix does not support having clang and 63 48 # gcc together as compilers and we need clang for the sources generation. 64 49 # However, clang emits tons of warnings about gcc's atomic-base library. ··· 71 56 72 57 buildInputs = [ 73 58 pinnedBoost 74 - llvmPackages_5.llvm 75 - llvmPackages_5.clang 76 - llvmPackages_5.clang-unwrapped 77 59 gmp 78 60 emacs 79 61 jre_headless