diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-05-01 10:20:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-01 10:20:56 +0200 |
| commit | a307b4840e30f5d172679e5c70d8b7596ced1b85 (patch) | |
| tree | a997e643aae4e8d9bc2d7fb3db0c0f4891d3c90b /pkgs | |
| parent | 2d7c884d2daf1ab549e02c75b0be49b7052d521e (diff) | |
| parent | 179c09cf6929ab2278a137832ca609e5c51c1f0b (diff) | |
Merge pull request #308016 from lxsameer/lxsameer/fix-mlir-on-master
llvm,mlir: Fix the incorrect MLIR_INSTALL_PACKAGE_DIR config
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/llvm/common/mlir/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix index 7a79ac30ba864..044e5c673108b 100644 --- a/pkgs/development/compilers/llvm/common/mlir/default.nix +++ b/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -1,6 +1,9 @@ -{ lib, stdenv, llvm_meta +{ lib +, stdenv +, llvm_meta , buildLlvmTools -, monorepoSrc, runCommand +, monorepoSrc +, runCommand , cmake , ninja , libxml2 @@ -14,7 +17,7 @@ stdenv.mkDerivation rec { inherit version doCheck; # Blank llvm dir just so relative path works - src = runCommand "${pname}-src-${version}" {} '' + src = runCommand "${pname}-src-${version}" { } '' mkdir -p "$out" cp -r ${monorepoSrc}/cmake "$out" cp -r ${monorepoSrc}/mlir "$out" @@ -45,7 +48,7 @@ stdenv.mkDerivation rec { "-DLLVM_INSTALL_TOOLCHAIN_ONLY=OFF" "-DMLIR_TOOLS_INSTALL_DIR=${placeholder "out"}/bin/" "-DLLVM_ENABLE_IDE=OFF" - "-DLLD_INSTALL_PACKAGE_DIR=${placeholder "out"}/lib/cmake/mlir" + "-DMLIR_INSTALL_PACKAGE_DIR=${placeholder "out"}/lib/cmake/mlir" "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" |