[pypy-commit] pypy llvm-translation-backend: Instead of setting the translation backend to llvm by default, set it only in translate.py.

[Manuel Jacob]

Author: Manuel Jacob
Branch: llvm-translation-backend
Changeset: r69022:06d5fdca63a4
Date: 2014-01-30 16:30 +0100
http://bitbucket.org/pypy/pypy/changeset/06d5fdca63a4/

Log:	Instead of setting the translation backend to llvm by default, set
	it only in translate.py.

diff --git a/rpython/config/translationoption.py b/rpython/config/translationoption.py
--- a/rpython/config/translationoption.py
+++ b/rpython/config/translationoption.py
@@ -292,7 +292,6 @@
                          if child._name != newname]
     descr = OptionDescription("pypy", "all options", children)
     config = Config(descr, **overrides)
-    config.translation.backend = 'llvm'
     if translating:
         config.translating = True
     if existing_config is not None:
diff --git a/rpython/translator/goal/translate.py b/rpython/translator/goal/translate.py
--- a/rpython/translator/goal/translate.py
+++ b/rpython/translator/goal/translate.py
@@ -109,6 +109,7 @@
     opt_parser.disable_interspersed_args()
 
     config = get_combined_translation_config(translating=True)
+    config.translation.backend = 'llvm'
     to_optparse(config, parser=opt_parser, useoptions=['translation.*'])
     translateconfig = Config(translate_optiondescr)
     to_optparse(translateconfig, parser=opt_parser)