distcc: fix evaluation (fixes #5002)
This commit is contained in:
parent
b69238542c
commit
1dfd467c14
|
@ -41,11 +41,10 @@ let
|
||||||
#
|
#
|
||||||
# extraConfig is meant to be sh lines exporting environment
|
# extraConfig is meant to be sh lines exporting environment
|
||||||
# variables like DISTCC_HOSTS, DISTCC_DIR, ...
|
# variables like DISTCC_HOSTS, DISTCC_DIR, ...
|
||||||
links = extraConfig : (runCommand "distcc-links"
|
links = extraConfig : (runCommand "distcc-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}
|
||||||
|
@ -53,7 +52,7 @@ let
|
||||||
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}
|
||||||
|
|
Loading…
Reference in a new issue