Author: mattip <[email protected]>
Branch: win32-stdlib
Changeset: r55565:c109a6474204
Date: 2012-06-11 00:12 +0300
http://bitbucket.org/pypy/pypy/changeset/c109a6474204/
Log: fix merge
diff --git a/pypy/config/translationoption.py b/pypy/config/translationoption.py
--- a/pypy/config/translationoption.py
+++ b/pypy/config/translationoption.py
@@ -96,8 +96,7 @@
requires={
"shadowstack": [("translation.gctransformer",
"framework")],
"asmgcc": [("translation.gctransformer", "framework"),
- ("translation.backend", "c"),
- ("translation.shared", False)],
+ ("translation.backend", "c")],
}),
# other noticeable options
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
