aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/cache.py5
-rw-r--r--tools/shared.py2
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/cache.py b/tools/cache.py
index e7908fba..13a53fe9 100644
--- a/tools/cache.py
+++ b/tools/cache.py
@@ -73,7 +73,8 @@ class JCache:
try:
data = cPickle.loads(zlib.decompress(open(cachename).read()))
except Exception, e:
- if DEBUG_CACHE: print >> sys.stderr, 'jcache decompress/unpickle error:', e
+ if self.debug: print >> sys.stderr, 'jcache decompress/unpickle error:', e
+ return
if len(data) != 2:
if self.debug: print >> sys.stderr, 'jcache error in get'
return
@@ -96,7 +97,7 @@ class JCache:
f.write(zlib.compress(cPickle.dumps([keys, value])))
f.close()
except Exception, e:
- if DEBUG_CACHE: print >> sys.stderr, 'jcache compress/pickle error:', e
+ if self.debug: print >> sys.stderr, 'jcache compress/pickle error:', e
return
# for i in range(len(keys)):
# open(cachename + '.key' + str(i), 'w').write(keys[i])
diff --git a/tools/shared.py b/tools/shared.py
index 1d1bebdd..6434fb06 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -388,11 +388,11 @@ if USE_EMSDK:
# Note that -nostdinc++ is not needed, since -nostdinc implies that!
EMSDK_OPTS = ['-nostdinc', '-Xclang', '-nobuiltininc', '-Xclang', '-nostdsysteminc',
'-Xclang', '-isystem' + path_from_root('system', 'local', 'include'),
+ '-Xclang', '-isystem' + path_from_root('system', 'include', 'libcxx'),
'-Xclang', '-isystem' + path_from_root('system', 'include'),
'-Xclang', '-isystem' + path_from_root('system', 'include', 'emscripten'),
'-Xclang', '-isystem' + path_from_root('system', 'include', 'bsd'), # posix stuff
'-Xclang', '-isystem' + path_from_root('system', 'include', 'libc'),
- '-Xclang', '-isystem' + path_from_root('system', 'include', 'libcxx'),
'-Xclang', '-isystem' + path_from_root('system', 'lib', 'libcxxabi', 'include'),
'-Xclang', '-isystem' + path_from_root('system', 'include', 'gfx'),
'-Xclang', '-isystem' + path_from_root('system', 'include', 'net'),