diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-26 09:38:21 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-26 09:38:21 +0000 |
commit | 35e5a5005e7ab85a640aee08137a96c42e4d55ea (patch) | |
tree | 77fc6fae473e0860b42c55b8bddcf8e3ed981074 /indra/cmake | |
parent | 6631e4d872fd4bd0208e44320e0b189b624cda86 (diff) | |
parent | 82575515e0614552548bd3f45cea558772bb032f (diff) |
merge.
Diffstat (limited to 'indra/cmake')
-rw-r--r-- | indra/cmake/run_build_test.py | 12 |
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__": |