tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

mono: llvm fork update 3.4svn-mono-f9b1a74368 -> 3.6-mono-2017-02-15

Also now builds with --enable-llvmloaded.

Extracted by @obadz from @abbradar's #23295
https://github.com/NixOS/nixpkgs/commit/d27768ac1bb06aa4471dc5bcd500a583bd4ece24

obadz 013927f9 1be47a2c

+12 -31
unified split
-12
pkgs/development/compilers/mono/build-fix-llvm.patch
··· 1 - diff --git a/lib/CodeGen/AsmPrinter/CMakeLists.txt.old b/lib/CodeGen/AsmPrinter/CMakeLists.txt 2 - index be484a6..c92ff46 100644 3 - --- a/lib/CodeGen/AsmPrinter/CMakeLists.txt.old 4 - +++ b/lib/CodeGen/AsmPrinter/CMakeLists.txt 5 - @@ -10,6 +10,7 @@ add_llvm_library(LLVMAsmPrinter 6 - DwarfCompileUnit.cpp 7 - DwarfDebug.cpp 8 - DwarfException.cpp 9 - + DwarfMonoException.cpp 10 - ErlangGCPrinter.cpp 11 - OcamlGCPrinter.cpp 12 - Win64Exception.cpp
···
-1
pkgs/development/compilers/mono/generic.nix
··· 30 ] 31 ++ stdenv.lib.optionals withLLVM [ 32 "--enable-llvm" 33 - "--enable-llvmloaded" 34 "--with-llvm=${llvm}" 35 ]; 36
··· 30 ] 31 ++ stdenv.lib.optionals withLLVM [ 32 "--enable-llvm" 33 "--with-llvm=${llvm}" 34 ]; 35
+12 -18
pkgs/development/compilers/mono/llvm.nix
··· 1 { stdenv 2 - , fetchurl 3 - , perl 4 , groff 5 , cmake 6 - , python 7 , libffi 8 , libbfd 9 , libxml2 ··· 14 15 stdenv.mkDerivation rec { 16 name = "llvm-${version}"; 17 - version = "3.4svn-mono-f9b1a74368"; 18 - src = fetchurl { 19 - # from the HEAD of the 'mono3' branch 20 - url = "https://github.com/mono/llvm/archive/f9b1a74368ec299fc04c4cfef4b5aa0992b7b806.tar.gz"; 21 - name = "${name}.tar.gz"; 22 - sha256 = "1bbkx4p5zdnk3nbdd5jxvbwqx8cdq8z1n1nhf639i98mggs0zhdg"; 23 - }; 24 25 - patches = [ ./build-fix-llvm.patch ]; 26 - unpackPhase = '' 27 - unpackFile ${src} 28 - mv llvm-* llvm 29 - sourceRoot=$PWD/llvm 30 - ''; 31 32 - buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind; 33 34 propagatedBuildInputs = [ ncurses zlib ]; 35 ··· 43 cmakeFlags = with stdenv; [ 44 "-DLLVM_ENABLE_FFI=ON" 45 "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" 46 - "-DCMAKE_CXX_FLAGS=-std=c++11" 47 ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; 48 49 enableParallelBuilding = true;
··· 1 { stdenv 2 + , lib 3 + , fetchFromGitHub 4 , groff 5 , cmake 6 + , python2 7 + , perl 8 , libffi 9 , libbfd 10 , libxml2 ··· 15 16 stdenv.mkDerivation rec { 17 name = "llvm-${version}"; 18 + version = "3.6-mono-2017-02-15"; 19 20 + src = fetchFromGitHub { 21 + owner = "mono"; 22 + repo = "llvm"; 23 + rev = "dbb6fdffdeb780d11851a6be77c209bd7ada4bd3"; 24 + sha256 = "07wd1cs3fdvzb1lv41b655z5zk34f47j8fgd9ljjimi5j9pj71f7"; 25 + }; 26 27 + buildInputs = [ perl groff cmake libxml2 python2 libffi ] ++ lib.optional stdenv.isLinux valgrind; 28 29 propagatedBuildInputs = [ ncurses zlib ]; 30 ··· 38 cmakeFlags = with stdenv; [ 39 "-DLLVM_ENABLE_FFI=ON" 40 "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" 41 ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; 42 43 enableParallelBuilding = true;