summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-11-26 09:47:00 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2009-11-26 09:47:00 +0000
commit1942e607f8298870b10f4147388cb4f307a8c08e (patch)
tree4bff4261cf5536c210526e85e42fa3da10ffd5ae /indra/cmake
parent664b848bac30a7f3f1177a683e0913c9457dc041 (diff)
parent35e5a5005e7ab85a640aee08137a96c42e4d55ea (diff)
merge.
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/run_build_test.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py
index fff78ecbe3..0f6967e42a 100644
--- a/indra/cmake/run_build_test.py
+++ b/indra/cmake/run_build_test.py
@@ -64,20 +64,20 @@ def main(command, libpath=[], vars={}):
# might not exist; instead of KeyError, just use an empty string.
dirs = os.environ.get(var, "").split(os.pathsep)
# Append the sequence in libpath
-## print "%s += %r" % (var, libpath)
+ print "%s += %r" % (var, libpath)
dirs.extend(libpath)
# Now rebuild the path string. This way we use a minimum of separators
# -- and we avoid adding a pointless separator when libpath is empty.
os.environ[var] = os.pathsep.join(dirs)
# Now handle arbitrary environment variables. The tricky part is ensuring
# that all the keys and values we try to pass are actually strings.
-## if vars:
-## print "Setting:"
-## for key, value in vars.iteritems():
-## print "%s=%s" % (key, value)
+ if vars:
+ print "Setting:"
+ for key, value in vars.iteritems():
+ print "%s=%s" % (key, value)
os.environ.update(dict([(str(key), str(value)) for key, value in vars.iteritems()]))
# Run the child process.
-## print "Running: %s" % " ".join(command)
+ print "Running: %s" % " ".join(command)
return subprocess.call(command)
if __name__ == "__main__":