forked from mirrors/nixpkgs
llvm: remove libedit from clang
clang should never need libedit. From what I understand this is only needed by LLDB. https://github.com/llvm-mirror/clang/search?q=libedit
This commit is contained in:
parent
7b73c7f49a
commit
9ee69c27c9
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }:
|
{ stdenv, fetch, cmake, libxml2, llvm, zlib, version, clang-tools-extra_src }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "clang-${version}";
|
name = "clang-${version}";
|
||||||
|
@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
patches = [ ./clang-separate-build.patch ./clang-purity.patch ];
|
patches = [ ./clang-separate-build.patch ./clang-purity.patch ];
|
||||||
|
|
||||||
buildInputs = [ cmake libedit libxml2 zlib ];
|
buildInputs = [ cmake libxml2 zlib ];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
|
{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src }:
|
||||||
let
|
let
|
||||||
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
|
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
|
||||||
in stdenv.mkDerivation {
|
in stdenv.mkDerivation {
|
||||||
|
@ -12,7 +12,7 @@ in stdenv.mkDerivation {
|
||||||
mv clang-tools-extra-* $sourceRoot/tools/extra
|
mv clang-tools-extra-* $sourceRoot/tools/extra
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [ cmake libedit libxml2 llvm ];
|
buildInputs = [ cmake libxml2 llvm ];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
|
{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src }:
|
||||||
|
|
||||||
let
|
let
|
||||||
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
|
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
|
||||||
|
@ -13,7 +13,7 @@ let
|
||||||
mv clang-tools-extra-* $sourceRoot/tools/extra
|
mv clang-tools-extra-* $sourceRoot/tools/extra
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [ cmake libedit libxml2 llvm ];
|
buildInputs = [ cmake libxml2 llvm ];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src, python }:
|
{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python }:
|
||||||
|
|
||||||
let
|
let
|
||||||
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
|
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
|
||||||
|
@ -13,7 +13,7 @@ let
|
||||||
mv clang-tools-extra-* $sourceRoot/tools/extra
|
mv clang-tools-extra-* $sourceRoot/tools/extra
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [ cmake libedit libxml2 llvm python ];
|
buildInputs = [ cmake libxml2 llvm python ];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src, python }:
|
{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python }:
|
||||||
|
|
||||||
let
|
let
|
||||||
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
|
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
|
||||||
|
@ -15,7 +15,7 @@ let
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
buildInputs = [ libedit libxml2 llvm python ];
|
buildInputs = [ libxml2 llvm python ];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
|
{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python
|
||||||
, fixDarwinDylibNames
|
, fixDarwinDylibNames
|
||||||
, enableManpages ? false
|
, enableManpages ? false
|
||||||
}:
|
}:
|
||||||
|
@ -19,7 +19,7 @@ let
|
||||||
nativeBuildInputs = [ cmake python ]
|
nativeBuildInputs = [ cmake python ]
|
||||||
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
|
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
|
||||||
|
|
||||||
buildInputs = [ libedit libxml2 llvm ]
|
buildInputs = [ libxml2 llvm ]
|
||||||
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
|
{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python
|
||||||
, fixDarwinDylibNames
|
, fixDarwinDylibNames
|
||||||
, enableManpages ? false
|
, enableManpages ? false
|
||||||
}:
|
}:
|
||||||
|
@ -19,7 +19,7 @@ let
|
||||||
nativeBuildInputs = [ cmake python ]
|
nativeBuildInputs = [ cmake python ]
|
||||||
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
|
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
|
||||||
|
|
||||||
buildInputs = [ libedit libxml2 llvm ]
|
buildInputs = [ libxml2 llvm ]
|
||||||
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
|
{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python
|
||||||
, fixDarwinDylibNames
|
, fixDarwinDylibNames
|
||||||
, enableManpages ? false
|
, enableManpages ? false
|
||||||
}:
|
}:
|
||||||
|
@ -19,7 +19,7 @@ let
|
||||||
nativeBuildInputs = [ cmake python ]
|
nativeBuildInputs = [ cmake python ]
|
||||||
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
|
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
|
||||||
|
|
||||||
buildInputs = [ libedit libxml2 llvm ]
|
buildInputs = [ libxml2 llvm ]
|
||||||
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
|
Loading…
Reference in a new issue