mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-31 22:51:22 +00:00
Fixing distccMasquerade to have gas too
This commit is contained in:
parent
d779fc2da9
commit
67c73aafe8
@ -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
|
||||
|
||||
'';
|
||||
}
|
||||
|
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user