Fixing distccMasquerade to have gas too

This commit is contained in:
Lluís Batlle i Rossell
2012-12-26 21:54:09 +00:00
parent d779fc2da9
commit 67c73aafe8
2 changed files with 12 additions and 1 deletions
+11 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, gccRaw }:
{ stdenv, gccRaw, binutils }:
stdenv.mkDerivation {
name = "distcc-masq-${gccRaw.name}";
@@ -27,5 +27,15 @@ stdenv.mkDerivation {
ln -sf $bin/*-g++ $out/bin/c++
done
fi
bbin=${binutils}/bin
if [ -f $bbin/as ]; then
ln -s $bbin/as $out/bin
else
for a in $bbin/*-as; do
ln -sf $bbin/*-as $out/bin/as
done
fi
'';
}
+1
View File
@@ -3094,6 +3094,7 @@ let
distccMasquerade = callPackage ../development/tools/misc/distcc/masq.nix {
gccRaw = gcc.gcc;
binutils = binutils;
};
docutils = builderDefsPackage (import ../development/tools/documentation/docutils) {