ccache: fix evaluation

This commit is contained in:
Vladimír Čunát 2014-11-16 09:19:11 +01:00
parent ee9e181ac6
commit 6fff0af6c3

View File

@ -16,11 +16,10 @@ stdenv.mkDerivation {
passthru = { passthru = {
# A derivation that provides gcc and g++ commands, but that # A derivation that provides gcc and g++ commands, but that
# will end up calling ccache for the given cacheDir # will end up calling ccache for the given cacheDir
links = extraConfig : (runCommand "ccache-links" links = extraConfig : (runCommand "ccache-links" { }
{ inherit (gcc) langC langCC; }
'' ''
mkdir -p $out/bin mkdir -p $out/bin
if [ $langC -eq 1 ]; then if [ -x "${gcc.gcc}/bin/gcc" ]; then
cat > $out/bin/gcc << EOF cat > $out/bin/gcc << EOF
#!/bin/sh #!/bin/sh
${extraConfig} ${extraConfig}
@ -28,7 +27,7 @@ stdenv.mkDerivation {
EOF EOF
chmod +x $out/bin/gcc chmod +x $out/bin/gcc
fi fi
if [ $langCC -eq 1 ]; then if [ -x "${gcc.gcc}/bin/g++" ]; then
cat > $out/bin/g++ << EOF cat > $out/bin/g++ << EOF
#!/bin/sh #!/bin/sh
${extraConfig} ${extraConfig}