Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: 
Changeset: r75728:75f1f2de8de1
Date: 2015-02-05 18:57 +0200
http://bitbucket.org/pypy/pypy/changeset/75f1f2de8de1/

Log:    merge

diff --git a/rpython/config/translationoption.py 
b/rpython/config/translationoption.py
--- a/rpython/config/translationoption.py
+++ b/rpython/config/translationoption.py
@@ -151,7 +151,9 @@
                default=False, cmdline="--dont-write-c-files"),
     ArbitraryOption("instrumentctl", "internal",
                default=None),
-    StrOption("output", "Output file name", cmdline="--output"),
+    StrOption("output", "Output file name (don't change for PyPy!"
+              " doesn't work with virtualenv+shared: issue 1971)",
+              cmdline="--really-force-output"),
     StrOption("secondaryentrypoints",
             "Comma separated list of keys choosing secondary entrypoints",
             cmdline="--entrypoints", default="main"),
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to