Author: Wim Lavrijsen <[email protected]>
Branch: reflex-support
Changeset: r46304:717259eb7a76
Date: 2011-08-05 11:06 -0700
http://bitbucket.org/pypy/pypy/changeset/717259eb7a76/
Log: force RTLD_GLOBAL
diff --git a/pypy/module/cppyy/capi/cint_capi.py
b/pypy/module/cppyy/capi/cint_capi.py
--- a/pypy/module/cppyy/capi/cint_capi.py
+++ b/pypy/module/cppyy/capi/cint_capi.py
@@ -1,7 +1,8 @@
import py, os
from pypy.translator.tool.cbuild import ExternalCompilationInfo
-from pypy.rpython.lltypesystem import rffi, lltype
+from pypy.rpython.lltypesystem import rffi, lltype, ll2ctypes
+from pypy.rlib import rdynload
pkgpath = py.path.local(__file__).dirpath().join(os.pardir)
srcpath = pkgpath.join("src")
@@ -14,12 +15,14 @@
rootincpath = []
rootlibpath = []
+ll2ctypes.load_library_kwargs['mode'] = rdynload.RTLD_GLOBAL |
rdynload.RTLD_NOW
+
eci = ExternalCompilationInfo(
separate_module_files=[srcpath.join("cintcwrapper.cxx")],
include_dirs=[incpath] + rootincpath,
includes=["cintcwrapper.h"],
library_dirs=rootlibpath,
- link_extra=["-lRIO", "-lThread", "-lCore", "-lCint", "-lm", "-ldl",
"-rdynamic"],
+ libraries=["Cint", "Core"],
use_cpp_linker=True,
)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
