diff options
author | Alon Zakai <alonzakai@gmail.com> | 2012-12-13 17:44:21 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2012-12-13 17:45:20 -0800 |
commit | e657c74773dfa7834a0e56fd895649df15593d97 (patch) | |
tree | c34b36d8cb4a94c2b8c4d00060e8f1374049ef19 /tools | |
parent | d46071bcb61b555a51ee985c8b38e621a956bafa (diff) | |
parent | f7dd2645ee157a60cce28cb7db9327728699d544 (diff) |
Merge branch 'incoming' into asm_js
Diffstat (limited to 'tools')
-rw-r--r-- | tools/shared.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/shared.py b/tools/shared.py index 6f5bd646..6fea9a92 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -92,7 +92,7 @@ else: node = 'node' try: node = Popen(['which', 'node'], stdout=PIPE).communicate()[0].replace('\n', '') or \ - Popen(['which', 'nodejs'], stdout=PIPE).communicate()[0].replace('\n', '') + Popen(['which', 'nodejs'], stdout=PIPE).communicate()[0].replace('\n', '') or node except: pass config_file = config_file.replace('{{{ NODE }}}', node) @@ -1060,7 +1060,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' % { 'winfix': '' if not WINDOWS e Building._is_ar_cache[filename] = sigcheck return sigcheck except Exception, e: - print 'shared.Building.is_ar failed to test whether file \'%s\' is a llvm archive file! Failed on exception: %s' % (filename, e) + print >> sys.stderr, 'shared.Building.is_ar failed to test whether file \'%s\' is a llvm archive file! Failed on exception: %s' % (filename, e) return False @staticmethod @@ -1080,7 +1080,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' % { 'winfix': '' if not WINDOWS e assert os.path.exists(test_ll) try_delete(test_ll) except Exception, e: - print 'shared.Building.is_bitcode failed to test whether file \'%s\' is a llvm bitcode file! Failed on exception: %s' % (filename, e) + print >> sys.stderr, 'shared.Building.is_bitcode failed to test whether file \'%s\' is a llvm bitcode file! Failed on exception: %s' % (filename, e) return False # look for magic signature |