[pypy-commit] pypy default: Yet another attempt to fix issue 1971.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r75736:e51a71b67c43
Date: 2015-02-06 12:44 +0100
http://bitbucket.org/pypy/pypy/changeset/e51a71b67c43/

Log:	Yet another attempt to fix issue 1971.

diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -235,6 +235,11 @@
 
         config.translation.suggest(check_str_without_nul=True)
         config.translation.suggest(shared=True)
+        if config.translation.shared:
+            if config.translation.output is not None:
+                raise Exception("Cannot use the --output option with PyPy "
+                                "when --shared is on (it is by default). "
+                                "See issue #1971.")
 
         if config.translation.thread:
             config.objspace.usemodules.thread = True
diff --git a/rpython/config/translationoption.py b/rpython/config/translationoption.py
--- a/rpython/config/translationoption.py
+++ b/rpython/config/translationoption.py
@@ -151,9 +151,7 @@
                default=False, cmdline="--dont-write-c-files"),
     ArbitraryOption("instrumentctl", "internal",
                default=None),
-    StrOption("output", "Output file name (don't change for PyPy!"
-              " doesn't work with virtualenv+shared: issue 1971)",
-              cmdline="--really-force-output"),
+    StrOption("output", "Output file name", cmdline="--output"),
     StrOption("secondaryentrypoints",
             "Comma separated list of keys choosing secondary entrypoints",
             cmdline="--entrypoints", default="main"),