summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Silverstein <csilvers@khanacademy.org>2008-06-10 00:52:08 +0000
committerCraig Silverstein <csilvers@khanacademy.org>2008-06-10 00:52:08 +0000
commit6c58c6f731726cfca3742a8ddcbde85ec37bf83c (patch)
tree5158ec2550c7e464bc638d2cd3c3bfc73f5a1009
parent502bd2aa4934072115392e5964302bbc970ffb25 (diff)
downloaddistcc-git-6c58c6f731726cfca3742a8ddcbde85ec37bf83c.tar.gz
Apparently, for freebsd's sh at least, "eval FOO=a bar" lets bar see
FOO=a, while "FOO=a eval bar" does not. So change from the latter formulation to the former. Tested by running 'make pump-maintainer-check' on freebsd and on linux (ubuntu). Reviewed by klarlund
-rwxr-xr-xpump.in17
1 files changed, 9 insertions, 8 deletions
diff --git a/pump.in b/pump.in
index d9d61d5..9fe8bbf 100755
--- a/pump.in
+++ b/pump.in
@@ -275,14 +275,15 @@ StartIncludeServer() {
#
# which will pass '*' to the include server (that is, the string consisting
# of one asterisk) without filename expansion.
- PYTHONOPTIMIZE=$PYTHONOPTIMIZE \
- PYTHONPATH="$pythonpath::$PYTHONPATH" \
- eval "'$PYTHON'" \
- "'$include_server'" \
- --port "'$socket'" \
- --pid_file "'$tmp_pid_file'" \
- -d1 \
- $INCLUDE_SERVER_ARGS
+ eval \
+ PYTHONOPTIMIZE=$PYTHONOPTIMIZE \
+ PYTHONPATH="$pythonpath::$PYTHONPATH" \
+ "'$PYTHON'" \
+ "'$include_server'" \
+ --port "'$socket'" \
+ --pid_file "'$tmp_pid_file'" \
+ -d1 \
+ $INCLUDE_SERVER_ARGS
)
# solaris sh's built-in test does not support -S, so we need to use