diff options
| author | Guillaume Maudoux <layus.on@gmail.com> | 2023-04-04 23:36:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-04 23:36:40 +0200 |
| commit | c5e6843b3370b4023287aa41c8c6ccc4b7a2c762 (patch) | |
| tree | ffc9ad61733b3e4f349ef07fa2bd05791a125a80 /pkgs/development | |
| parent | 246567a3ad88e3119c2001e2fe78be233474cde0 (diff) | |
| parent | 00aab4510243df735824d004a9fe569787dd57dc (diff) | |
Merge pull request #224639 from NixOS/mozart/bump-llvm8
mozart: use llvmPackages_8 instead of llvmPackages_5
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/mozart/default.nix | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix index b901e7c34891e..8f68487ecf701 100644 --- a/pkgs/development/compilers/mozart/default.nix +++ b/pkgs/development/compilers/mozart/default.nix @@ -7,7 +7,6 @@ , boost169 , pinnedBoost ? boost169 , llvmPackages -, llvmPackages_5 , gmp , emacs , jre_headless @@ -42,23 +41,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper unzip ]; - # We cannot compile with both gcc and clang, but we need clang during the - # process, so we compile everything with clang. - # BUT, we need clang4 for parsing, and a more recent clang for compiling. cmakeFlags = [ - "-DCMAKE_CXX_COMPILER=${llvmPackages.clang}/bin/clang++" - "-DCMAKE_C_COMPILER=${llvmPackages.clang}/bin/clang" "-DBoost_USE_STATIC_LIBS=OFF" "-DMOZART_BOOST_USE_STATIC_LIBS=OFF" - "-DCMAKE_PROGRAM_PATH=${llvmPackages_5.clang}/bin" - # Rationale: Nix's cc-wrapper needs to see a compile flag (like -c) to - # infer that it is not a linking call, and stop trashing the command line - # with linker flags. - # As it does not recognise -emit-ast, we pass -c immediately overridden - # by -emit-ast. - # The remaining is just the default flags that we cannot reuse and need - # to repeat here. - "-DMOZART_GENERATOR_FLAGS='-c;-emit-ast;--std=c++0x;-Wno-invalid-noreturn;-Wno-return-type;-Wno-braced-scalar-init'" # We are building with clang, as nix does not support having clang and # gcc together as compilers and we need clang for the sources generation. # However, clang emits tons of warnings about gcc's atomic-base library. @@ -71,9 +56,6 @@ in stdenv.mkDerivation rec { buildInputs = [ pinnedBoost - llvmPackages_5.llvm - llvmPackages_5.clang - llvmPackages_5.clang-unwrapped gmp emacs jre_headless |