mirror of
https://github.com/Feliix42/mlir.nix.git
synced 2024-11-24 19:36:31 +00:00
update MLIR revision to llvmorg-17-init
This commit is contained in:
parent
d35d1beb45
commit
c2c192814f
2 changed files with 10 additions and 23 deletions
|
@ -2,11 +2,11 @@
|
|||
"nodes": {
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1673800717,
|
||||
"narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=",
|
||||
"lastModified": 1674407282,
|
||||
"narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f",
|
||||
"rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
27
flake.nix
27
flake.nix
|
@ -8,7 +8,7 @@
|
|||
let
|
||||
|
||||
# git revision to use (for version and git pull
|
||||
gitRevision = "49caf7012170422afa84868598063818f9344228";
|
||||
gitRevision = "llvmorg-17-init";
|
||||
|
||||
# to work with older version of flakes
|
||||
lastModifiedDate = self.lastModifiedDate or self.lastModified or "19700101";
|
||||
|
@ -36,16 +36,6 @@
|
|||
mlir = with final; llvmPackages_14.stdenv.mkDerivation rec {
|
||||
name = "mlir-${version}";
|
||||
|
||||
#readOnlySrc = ./.;
|
||||
|
||||
#src = ./.;
|
||||
#src = runCommand "${name}-src-${version}" {} (''
|
||||
#mkdir -p "$out"
|
||||
#cp -r ${readOnlySrc}/cmake "$out"
|
||||
#cp -r ${readOnlySrc}/llvm "$out"
|
||||
#cp -r ${readOnlySrc}/third-party "$out"
|
||||
#'');
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "llvm";
|
||||
repo = "llvm-project";
|
||||
|
@ -61,7 +51,6 @@
|
|||
cmake
|
||||
ncurses
|
||||
zlib
|
||||
#pkg-config
|
||||
llvmPackages_14.llvm
|
||||
llvmPackages_14.clang
|
||||
llvmPackages_14.bintools
|
||||
|
@ -69,14 +58,6 @@
|
|||
|
||||
buildInputs = [ libxml2 ];
|
||||
|
||||
#propagatedBuildInputs = [ ncurses zlib ];
|
||||
|
||||
# where to find libgcc
|
||||
#NIX_LDFLAGS="-L${gccForLibs}/lib/gcc/${targetPlatform.config}/${gccForLibs.version}"; # -L ${zlib}/lib";
|
||||
# teach clang about C startup file locations
|
||||
#CFLAGS="-B${gccForLibs}/lib/gcc/${targetPlatform.config}/${gccForLibs.version} -B ${stdenv.cc.libc}/lib";
|
||||
|
||||
#LD_LIBRARY_PATH="${zlib}/lib:${ncurses}/lib:$LD_LIBRARY_PATH";
|
||||
|
||||
cmakeFlags = [
|
||||
# "-DGCC_INSTALL_PREFIX=${gcc}"
|
||||
|
@ -97,6 +78,7 @@
|
|||
# this makes llvm only to produce code for the current platform, this saves CPU time, change it to what you need
|
||||
"-DLLVM_TARGETS_TO_BUILD=X86"
|
||||
# -DLLVM_TARGETS_TO_BUILD="X86;NVPTX;AMDGPU" \
|
||||
# NOTE(feliix42): THIS IS ABI BREAKING!!
|
||||
"-DLLVM_ENABLE_ASSERTIONS=ON"
|
||||
# Using clang and lld speeds up the build, we recomment adding:
|
||||
"-DCMAKE_C_COMPILER=clang"
|
||||
|
@ -110,6 +92,11 @@
|
|||
# https://github.com/ClangBuiltLinux/tc-build/issues/150#issuecomment-845418812
|
||||
#"-DLLVM_ENABLE_LIBXML2=OFF"
|
||||
];
|
||||
|
||||
# TODO(feliix42): Fix this, as it requires the python package `lit`
|
||||
# postInstall = ''
|
||||
# cp bin/llvm-lit $out/bin
|
||||
# '';
|
||||
};
|
||||
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue