diff options
| author | Petr Rockai <me@mornfall.net> | 2013-09-07 11:04:31 +0200 |
|---|---|---|
| committer | Petr Rockai <me@mornfall.net> | 2013-11-16 13:53:48 +0100 |
| commit | 2c9f0e059ab5cf7acc4769f1dfd8cf1a4e3c3663 (patch) | |
| tree | 2a3ae74ca467bd104d124f3bb969b2a9469b8366 /pkgs | |
| parent | 52abed95cad887838e75c3531b6fbb785dd0ef59 (diff) | |
| download | nixpkgs-2c9f0e059ab5cf7acc4769f1dfd8cf1a4e3c3663.tar nixpkgs-2c9f0e059ab5cf7acc4769f1dfd8cf1a4e3c3663.tar.gz nixpkgs-2c9f0e059ab5cf7acc4769f1dfd8cf1a4e3c3663.tar.bz2 nixpkgs-2c9f0e059ab5cf7acc4769f1dfd8cf1a4e3c3663.tar.lz nixpkgs-2c9f0e059ab5cf7acc4769f1dfd8cf1a4e3c3663.tar.xz nixpkgs-2c9f0e059ab5cf7acc4769f1dfd8cf1a4e3c3663.tar.zst nixpkgs-2c9f0e059ab5cf7acc4769f1dfd8cf1a4e3c3663.zip | |
clang: Do not try to build clang-tblgen in LLVM's build path.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/llvm/clang-tablegen-dir.patch | 9 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/clang.nix | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/compilers/llvm/clang-tablegen-dir.patch b/pkgs/development/compilers/llvm/clang-tablegen-dir.patch new file mode 100644 index 00000000000..de6a468b239 --- /dev/null +++ b/pkgs/development/compilers/llvm/clang-tablegen-dir.patch @@ -0,0 +1,9 @@ +--- a/utils/TableGen/CMakeLists.txt (revision 190146) ++++ b/utils/TableGen/CMakeLists.txt (working copy) +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS Support) ++set(LLVM_TOOLS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) + + add_tablegen(clang-tblgen CLANG + ClangASTNodesEmitter.cpp + diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index df58591973e..8c178c9ce03 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { buildInputs = [ perl llvm groff cmake libxml2 python ]; - patches = stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; + patches = [ ./clang-tablegen-dir.patch ] ++ + stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; cmakeFlags = [ "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" |