[pypy-commit] pypy default: do it yet differently

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r77644:f3ab547c661e
Date: 2015-05-28 14:03 +0200
http://bitbucket.org/pypy/pypy/changeset/f3ab547c661e/

Log:	do it yet differently

diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -324,8 +324,6 @@
     modules = working_modules.copy()
     if config.translation.sandbox:
         modules = default_modules
-    if not config.translation.jit:
-        del modules['_vmprof']
     # ignore names from 'essential_modules', notably 'exceptions', which
     # may not be present in config.objspace.usemodules at all
     modules = [name for name in modules if name not in essential_modules]
diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -276,6 +276,8 @@
             config.objspace.usemodules.pypyjit = True
         elif config.objspace.usemodules.pypyjit:
             config.translation.jit = True
+        else:
+            config.objspace.usemodules._vmprof = False
 
         if config.translation.sandbox:
             config.objspace.lonepycfiles = False