cctools: Don't always bring in headers
- Give cctools a dev output for the headers - Update Libsystem to grab the headers from that dev output - Don't include the headers in Darwin binutils, just as GNU Binutils no longer does.
This commit is contained in:
parent
32a6838bc6
commit
652c2beda9
@ -23,7 +23,7 @@ appleDerivation rec {
|
||||
(cd $dep/include && find . -name '*.h' | cpio -pdm $out/include)
|
||||
done
|
||||
|
||||
(cd ${cctools}/include/mach-o && find . -name '*.h' | cpio -pdm $out/include/mach-o)
|
||||
(cd ${cctools.dev}/include/mach-o && find . -name '*.h' | cpio -pdm $out/include/mach-o)
|
||||
|
||||
cat <<EOF > $out/include/TargetConditionals.h
|
||||
#ifndef __TARGETCONDITIONALS__
|
||||
|
@ -37,10 +37,6 @@ stdenv.mkDerivation {
|
||||
ln -sf "${cctools}/bin/$i" "$out/bin/$i"
|
||||
done
|
||||
|
||||
for i in ${cctools}/include/*; do
|
||||
ln -s "$i" "$out/include/$(basename $i)"
|
||||
done
|
||||
|
||||
# FIXME: this will give us incorrect man pages for bits of cctools
|
||||
ln -s ${binutils-raw.out}/share $out/share
|
||||
|
||||
|
@ -29,6 +29,8 @@ let
|
||||
sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ autoconf automake libtool_2 ];
|
||||
buildInputs = [ libuuid ] ++
|
||||
# Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang)
|
||||
|
Loading…
Reference in New Issue
Block a user