[pypy-commit] pypy win32-optionals: use sys.platform instead of 'host' in --platform to utilize Option.requires

[mattip]

Author: mattip <matti.picus at gmail.com>
Branch: win32-optionals
Changeset: r77316:211990006cf0
Date: 2015-05-13 23:51 +0300
http://bitbucket.org/pypy/pypy/changeset/211990006cf0/

Log:	use sys.platform instead of 'host' in --platform to utilize
	Option.requires

diff --git a/rpython/config/translationoption.py b/rpython/config/translationoption.py
--- a/rpython/config/translationoption.py
+++ b/rpython/config/translationoption.py
@@ -33,10 +33,10 @@
 
 PLATFORMS = [
     'maemo',
-    'host',
     'distutils',
     'arm',
 ]
+host_platform = sys.platform
 
 translation_optiondescription = OptionDescription(
         "translation", "Translation Options", [
@@ -276,7 +276,7 @@
     ]),
 
     ChoiceOption("platform",
-                 "target platform", ['host'] + PLATFORMS, default='host',
+                 "target platform", [host_platform] + PLATFORMS, default=host_platform,
                  cmdline='--platform',
                  suggests={"arm": [("translation.gcrootfinder", "shadowstack"),
                                    ("translation.jit_backend", "arm")]}),
@@ -385,8 +385,9 @@
 
     # disallow asmgcc on OS/X and on Win32
     if config.translation.gcrootfinder == "asmgcc":
-        if sys.platform == "darwin" or sys.platform =="win32":
-            raise ConfigError("'asmgcc' not supported on this platform")
+        if config.translation.platform == "darwin" or \
+           config.translation.platform =="win32":
+            raise ConfigError("'asmgcc' not supported on platform '%s'" % config.translation.platform)
 
 # ----------------------------------------------------------------
 
diff --git a/rpython/translator/platform/__init__.py b/rpython/translator/platform/__init__.py
--- a/rpython/translator/platform/__init__.py
+++ b/rpython/translator/platform/__init__.py
@@ -324,7 +324,7 @@
 platform = host = host_factory()
 
 def pick_platform(new_platform, cc):
-    if new_platform == 'host':
+    if new_platform == sys.platform:
         return host_factory(cc)
     elif new_platform == 'maemo':
         from rpython.translator.platform.maemo import Maemo