public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41952 from obsidiansystems/darwin-booting-llvm 

llvm: Remove unneeded libcxxabi dependencies
This commit is contained in:
John Ericson 2018-06-13 21:16:32 -04:00 committed by GitHub
parent dfa2895181 7156f46949
commit 3e3a9e661d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/llvm/3.7/libc++abi.nix
View File

@ -11,7 +11,8 @@ in stdenv.mkDerivation {
src = fetch "libcxxabi" "0ambfcmr2nh88hx000xb7yjm9lsqjjz49w5mlf6dlxzmj3nslzx4"; src = fetch "libcxxabi" "0ambfcmr2nh88hx000xb7yjm9lsqjjz49w5mlf6dlxzmj3nslzx4";
buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; nativeBuildInputs = [ cmake ];
buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
postUnpack = '' postUnpack = ''
unpackFile ${libcxx.src} unpackFile ${libcxx.src}

1
pkgs/development/compilers/llvm/3.8/default.nix
View File

@ -20,7 +20,6 @@ let
in { in {
llvm = callPackage ./llvm.nix { llvm = callPackage ./llvm.nix {
inherit compiler-rt_src; inherit compiler-rt_src;
inherit (targetLlvmLibraries) libcxxabi;
}; };
clang-unwrapped = callPackage ./clang { clang-unwrapped = callPackage ./clang {

3
pkgs/development/compilers/llvm/3.8/libc++abi.nix
View File

@ -5,7 +5,8 @@ stdenv.mkDerivation {
src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1"; src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1";
buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; nativeBuildInputs = [ cmake ];
buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
postUnpack = '' postUnpack = ''
unpackFile ${libcxx.src} unpackFile ${libcxx.src}

4
pkgs/development/compilers/llvm/3.8/llvm.nix
View File

@ -13,7 +13,6 @@
, version , version
, zlib , zlib
, compiler-rt_src , compiler-rt_src
, libcxxabi
, debugVersion ? false , debugVersion ? false
, enableSharedLibraries ? true , enableSharedLibraries ? true
}: }:
@ -31,8 +30,7 @@ in stdenv.mkDerivation rec {
mv compiler-rt-* $sourceRoot/projects/compiler-rt mv compiler-rt-* $sourceRoot/projects/compiler-rt
''; '';
buildInputs = [ perl groff cmake libxml2 python libffi ] buildInputs = [ perl groff cmake libxml2 python libffi ];
++ stdenv.lib.optional stdenv.isDarwin libcxxabi;
propagatedBuildInputs = [ ncurses zlib ]; propagatedBuildInputs = [ ncurses zlib ];

1
pkgs/development/compilers/llvm/3.9/default.nix
View File

@ -20,7 +20,6 @@ let
in { in {
llvm = callPackage ./llvm.nix { llvm = callPackage ./llvm.nix {
inherit compiler-rt_src; inherit compiler-rt_src;
inherit (targetLlvmLibraries) libcxxabi;
}; };
clang-unwrapped = callPackage ./clang { clang-unwrapped = callPackage ./clang {

1
pkgs/development/compilers/llvm/3.9/libc++abi.nix
View File

@ -6,7 +6,6 @@ stdenv.mkDerivation {
src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj"; src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj";
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
postUnpack = '' postUnpack = ''

3
pkgs/development/compilers/llvm/3.9/llvm.nix
View File

@ -13,7 +13,6 @@
, version , version
, zlib , zlib
, compiler-rt_src , compiler-rt_src
, libcxxabi
, debugVersion ? false , debugVersion ? false
, enableSharedLibraries ? (buildPlatform == hostPlatform) , enableSharedLibraries ? (buildPlatform == hostPlatform)
, darwin , darwin
@ -53,7 +52,7 @@ in stdenv.mkDerivation rec {
groff groff
libxml2 libxml2
libffi libffi
] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; ];
propagatedBuildInputs = [ ncurses zlib ]; propagatedBuildInputs = [ ncurses zlib ];

1
pkgs/development/compilers/llvm/4/default.nix
View File

@ -28,7 +28,6 @@ let
llvm = overrideManOutput (callPackage ./llvm.nix { llvm = overrideManOutput (callPackage ./llvm.nix {
inherit compiler-rt_src; inherit compiler-rt_src;
inherit (targetLlvmLibraries) libcxxabi;
}); });
clang-unwrapped = overrideManOutput (callPackage ./clang { clang-unwrapped = overrideManOutput (callPackage ./clang {
inherit clang-tools-extra_src; inherit clang-tools-extra_src;

4
pkgs/development/compilers/llvm/4/llvm.nix
View File

@ -12,7 +12,6 @@
, release_version , release_version
, zlib , zlib
, compiler-rt_src , compiler-rt_src
, libcxxabi
, debugVersion ? false , debugVersion ? false
, enableManpages ? false , enableManpages ? false
, enableSharedLibraries ? true , enableSharedLibraries ? true
@ -42,8 +41,7 @@ in stdenv.mkDerivation (rec {
nativeBuildInputs = [ cmake python ] nativeBuildInputs = [ cmake python ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx; ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
buildInputs = [ libxml2 libffi ] buildInputs = [ libxml2 libffi ];
++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ];
propagatedBuildInputs = [ ncurses zlib ]; propagatedBuildInputs = [ ncurses zlib ];

3
pkgs/development/compilers/llvm/5/llvm.nix
View File

@ -43,7 +43,8 @@ in stdenv.mkDerivation (rec {
++ stdenv.lib.optional enableManpages python.pkgs.sphinx; ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
buildInputs = [ libxml2 libffi ] 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 ]; propagatedBuildInputs = [ ncurses zlib ];

4
pkgs/development/compilers/llvm/6/default.nix
View File

@ -25,9 +25,7 @@ let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
in { in {
llvm = overrideManOutput (callPackage ./llvm.nix { llvm = overrideManOutput (callPackage ./llvm.nix { });
inherit (targetLlvmLibraries) libcxxabi;
});
clang-unwrapped = overrideManOutput (callPackage ./clang { clang-unwrapped = overrideManOutput (callPackage ./clang {
inherit clang-tools-extra_src; inherit clang-tools-extra_src;
}); });

4
pkgs/development/compilers/llvm/6/llvm.nix
View File

@ -11,7 +11,6 @@
, version , version
, release_version , release_version
, zlib , zlib
, libcxxabi
, debugVersion ? false , debugVersion ? false
, enableManpages ? false , enableManpages ? false
, enableSharedLibraries ? true , enableSharedLibraries ? true
@ -40,8 +39,7 @@ in stdenv.mkDerivation (rec {
nativeBuildInputs = [ cmake python ] nativeBuildInputs = [ cmake python ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx; ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
buildInputs = [ libxml2 libffi ] buildInputs = [ libxml2 libffi ];
++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ];
propagatedBuildInputs = [ ncurses zlib ]; propagatedBuildInputs = [ ncurses zlib ];