bintools-wrapper: Import separately from cc-wrapper

This commit is contained in:
John Ericson
2017-12-13 16:08:18 -05:00
parent 8e557ed2c5
commit 2bba929062
16 changed files with 150 additions and 77 deletions
+2 -2
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
buildCommand = ''
mkdir -p $out/bin $out/include
ln -s ${binutils-raw.out}/bin/${targetPrefix}c++filt $out/bin/${targetPrefix}c++filt
ln -s ${binutils-raw.bintools.out}/bin/${targetPrefix}c++filt $out/bin/${targetPrefix}c++filt
# We specifically need:
# - ld: binutils doesn't provide it on darwin
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
done
# FIXME: this will give us incorrect man pages for bits of cctools
ln -s ${binutils-raw.out}/share $out/share
ln -s ${binutils-raw.bintools.out}/share $out/share
ln -s ${cctools}/libexec $out/libexec
'';