Author: Philip Jenvey <[email protected]>
Branch:
Changeset: r69978:ad48ce2a9283
Date: 2014-03-15 17:51 -0700
http://bitbucket.org/pypy/pypy/changeset/ad48ce2a9283/
Log: don't hardcode the version
diff --git a/pypy/module/cpyext/test/test_cpyext.py
b/pypy/module/cpyext/test/test_cpyext.py
--- a/pypy/module/cpyext/test/test_cpyext.py
+++ b/pypy/module/cpyext/test/test_cpyext.py
@@ -64,8 +64,10 @@
kwds["libraries"] = [api_library]
# '%s' undefined; assuming extern returning int
kwds["compile_extra"] = ["/we4013"]
- # prevent linking with python27.lib
- kwds["link_extra"]=["/NODEFAULTLIB:Python27.lib"]
+ # prevent linking with PythonXX.lib
+ w_maj, w_min = space.fixedview(space.sys.get('version_info'), 5)[:2]
+ kwds["link_extra"] = ["/NODEFAULTLIB:Python%d%d.lib" %
+ (space.int_w(w_maj), space.int_w(w_min))]
elif sys.platform == 'darwin':
kwds["link_files"] = [str(api_library + '.dylib')]
else:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
