Merge branch 'incoming'

1 files changed, 5 insertions, 2 deletions

diff --git a/emcc b/emcc
index aa8827da..29e5aa8d 100755
--- a/emcc
+++ b/emcc
@@ -110,7 +110,7 @@ if DEBUG and LEAVE_INPUTS_RAW: print >> sys.stderr, 'emcc: leaving inputs raw'
 stdout = PIPE if not DEBUG else None # suppress output of child processes
 stderr = PIPE if not DEBUG else None # unless we are in DEBUG mode
 
-shared.check_sanity()
+shared.check_sanity(force=DEBUG)
 
 # Handle some global flags
 
@@ -414,7 +414,10 @@ if TEMP_DIR:
     shutil.rmtree(temp_dir) # clear it
   os.makedirs(temp_dir)
 else:
-  temp_dir = tempfile.mkdtemp()
+  temp_root = os.path.join(shared.TEMP_DIR, 'emcc')
+  if not os.path.exists(temp_root):
+    os.makedirs(temp_root)
+  temp_dir = tempfile.mkdtemp(dir=temp_root)
 
 def in_temp(name):
   return os.path.join(temp_dir, os.path.basename(name))