aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Lavrijsen <WLavrijsen@lbl.gov>2021-02-09 15:57:49 -0800
committerWim Lavrijsen <WLavrijsen@lbl.gov>2021-02-09 15:57:49 -0800
commit487cfc8eb28f748e18e93bbc7ebb5fc92b31f220 (patch)
tree532a503d87b6519f415625123ac10586f8efda57
parentmerge default into cppyy dev branch (diff)
downloadpypy-487cfc8eb28f748e18e93bbc7ebb5fc92b31f220.tar.gz
pypy-487cfc8eb28f748e18e93bbc7ebb5fc92b31f220.tar.bz2
pypy-487cfc8eb28f748e18e93bbc7ebb5fc92b31f220.zip
more correct way of finding the backend library
-rw-r--r--pypy/module/_cppyy/capi/loadable_capi.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pypy/module/_cppyy/capi/loadable_capi.py b/pypy/module/_cppyy/capi/loadable_capi.py
index 101d36ece2..b371c8ce47 100644
--- a/pypy/module/_cppyy/capi/loadable_capi.py
+++ b/pypy/module/_cppyy/capi/loadable_capi.py
@@ -387,7 +387,9 @@ def load_backend(space):
fullname = backend_library+backend_ext
state.backend = W_Library(space, space.newtext(fullname), dldflags)
except Exception as e:
- soabi = '.pypy-%d%d' % PYPY_VERSION[:2]
+ soabi = space.config.objspace.soabi
+ if soabi is None:
+ soabi = '.pypy-%d%d' % PYPY_VERSION[:2]
state.backend = W_Library(space, space.newtext(backend_library+soabi+backend_ext), dldflags)
if state.backend:
@@ -403,7 +405,7 @@ def verify_backend(space):
except Exception:
if objectmodel.we_are_translated():
raise oefmt(space.w_ImportError,
- "missing reflection library %s", backend_library)
+ "missing backend library %s", backend_library)
return False
return True