diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-13 17:18:19 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-13 21:06:00 -0400 |
commit | 7156f469495188b631cfc42d93330ecc2656e408 (patch) | |
tree | b374f7643eb831883abf24099b02789dec561987 | |
parent | e358fff0d668d825e6e9b8376466bf56e0422d7b (diff) | |
download | nixlib-7156f469495188b631cfc42d93330ecc2656e408.tar nixlib-7156f469495188b631cfc42d93330ecc2656e408.tar.gz nixlib-7156f469495188b631cfc42d93330ecc2656e408.tar.bz2 nixlib-7156f469495188b631cfc42d93330ecc2656e408.tar.lz nixlib-7156f469495188b631cfc42d93330ecc2656e408.tar.xz nixlib-7156f469495188b631cfc42d93330ecc2656e408.tar.zst nixlib-7156f469495188b631cfc42d93330ecc2656e408.zip |
llvm 3.8+: Remove unneeded libcxxabi dependency
Evidentally this hasn't been needed for a while
-rw-r--r-- | pkgs/development/compilers/llvm/3.8/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.8/llvm.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.9/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.9/llvm.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/4/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/4/llvm.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/5/llvm.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/6/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/6/llvm.nix | 4 |
9 files changed, 7 insertions, 18 deletions
diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index 6fa1a0cf2e26..3f0cd7d0a763 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -20,7 +20,6 @@ let in { llvm = callPackage ./llvm.nix { inherit compiler-rt_src; - inherit (targetLlvmLibraries) libcxxabi; }; clang-unwrapped = callPackage ./clang { diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 0f259977f702..2c65234b6a47 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -13,7 +13,6 @@ , version , zlib , compiler-rt_src -, libcxxabi , debugVersion ? false , enableSharedLibraries ? true }: @@ -31,8 +30,7 @@ in stdenv.mkDerivation rec { mv compiler-rt-* $sourceRoot/projects/compiler-rt ''; - buildInputs = [ perl groff cmake libxml2 python libffi ] - ++ stdenv.lib.optional stdenv.isDarwin libcxxabi; + buildInputs = [ perl groff cmake libxml2 python libffi ]; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index c3bf0b48d649..3735fb6a02c0 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -20,7 +20,6 @@ let in { llvm = callPackage ./llvm.nix { inherit compiler-rt_src; - inherit (targetLlvmLibraries) libcxxabi; }; clang-unwrapped = callPackage ./clang { diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index f80201167505..71b67aa7dc57 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -13,7 +13,6 @@ , version , zlib , compiler-rt_src -, libcxxabi , debugVersion ? false , enableSharedLibraries ? (buildPlatform == hostPlatform) , darwin @@ -53,7 +52,7 @@ in stdenv.mkDerivation rec { groff libxml2 libffi - ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; + ]; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index fecf65136bcd..c46e520a33df 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -28,7 +28,6 @@ let llvm = overrideManOutput (callPackage ./llvm.nix { inherit compiler-rt_src; - inherit (targetLlvmLibraries) libcxxabi; }); clang-unwrapped = overrideManOutput (callPackage ./clang { inherit clang-tools-extra_src; diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index bc8453f743ad..a371296db326 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -12,7 +12,6 @@ , release_version , zlib , compiler-rt_src -, libcxxabi , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true @@ -42,8 +41,7 @@ in stdenv.mkDerivation (rec { nativeBuildInputs = [ cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; - buildInputs = [ libxml2 libffi ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; + buildInputs = [ libxml2 libffi ]; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 66985861e386..5070de1f48b1 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -43,7 +43,8 @@ in stdenv.mkDerivation (rec { ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; buildInputs = [ libxml2 libffi ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; + # TODO(@Ericson2314): Remove next mass rebuild + ++ stdenv.lib.optionals (stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) [ libcxxabi ]; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 17c743c04082..bbac21ef6796 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -25,9 +25,7 @@ let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); in { - llvm = overrideManOutput (callPackage ./llvm.nix { - inherit (targetLlvmLibraries) libcxxabi; - }); + llvm = overrideManOutput (callPackage ./llvm.nix { }); clang-unwrapped = overrideManOutput (callPackage ./clang { inherit clang-tools-extra_src; }); diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 8877ccd11621..9cae65ef1030 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -11,7 +11,6 @@ , version , release_version , zlib -, libcxxabi , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true @@ -40,8 +39,7 @@ in stdenv.mkDerivation (rec { nativeBuildInputs = [ cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; - buildInputs = [ libxml2 libffi ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; + buildInputs = [ libxml2 libffi ]; propagatedBuildInputs = [ ncurses zlib ]; |