dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #308016 from lxsameer/lxsameer/fix-mlir-on-master

Browse Source 
llvm,mlir: Fix the incorrect MLIR_INSTALL_PACKAGE_DIR config
This commit is contained in:
Weijia Wang 2024-05-01 10:20:56 +02:00 committed by GitHub
commit a307b4840e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/compilers/llvm/common/mlir/default.nix
View File

@ -1,6 +1,9 @@
{ lib, stdenv, llvm_meta { lib
, stdenv
, llvm_meta
, buildLlvmTools , buildLlvmTools
, monorepoSrc, runCommand , monorepoSrc
, runCommand
, cmake , cmake
, ninja , ninja
, libxml2 , libxml2
@ -14,7 +17,7 @@ stdenv.mkDerivation rec {
inherit version doCheck; inherit version doCheck;
# Blank llvm dir just so relative path works # Blank llvm dir just so relative path works
src = runCommand "${pname}-src-${version}" {} '' src = runCommand "${pname}-src-${version}" { } ''
mkdir -p "$out" mkdir -p "$out"
cp -r ${monorepoSrc}/cmake "$out" cp -r ${monorepoSrc}/cmake "$out"
cp -r ${monorepoSrc}/mlir "$out" cp -r ${monorepoSrc}/mlir "$out"
@ -45,7 +48,7 @@ stdenv.mkDerivation rec {
"-DLLVM_INSTALL_TOOLCHAIN_ONLY=OFF" "-DLLVM_INSTALL_TOOLCHAIN_ONLY=OFF"
"-DMLIR_TOOLS_INSTALL_DIR=${placeholder "out"}/bin/" "-DMLIR_TOOLS_INSTALL_DIR=${placeholder "out"}/bin/"
"-DLLVM_ENABLE_IDE=OFF" "-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_BUILD_TESTS=${if doCheck then "ON" else "OFF"}"
"-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_FFI=ON"
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"