diff options
| author |   Armin Rigo <arigo@tunes.org> | 2015-06-18 18:02:31 +0200 |
|---|---|---|
| committer | Armin Rigo <arigo@tunes.org> | 2015-06-18 18:02:31 +0200 |
| commit | 7324572feb5b330804b71ae31a9a351aa0b8ddf2 (patch) | |
| tree | a27c50acc99b1118bb02e763d3640f324251fbb2 /pypy/goal | |
| parent | issue #2067: fix the error message (diff) | |
| download | pypy-7324572feb5b330804b71ae31a9a351aa0b8ddf2.tar.gz pypy-7324572feb5b330804b71ae31a9a351aa0b8ddf2.tar.bz2 pypy-7324572feb5b330804b71ae31a9a351aa0b8ddf2.zip | |
Don't give "libpypy-c.so" in the example programs, as this seems to
confuse people into thinking they only need to have the "libpypy-c.so"
somewhere.
Fix pypy_setup_home("xx") to also accept as "xx" the path of the root
directory of pypy directly; currently it has to be anything strictly
inside it.
Diffstat (limited to 'pypy/goal')
| -rw-r--r-- | pypy/goal/targetpypystandalone.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py index 63ae1bf256..00d12b84d3 100644 --- a/pypy/goal/targetpypystandalone.py +++ b/pypy/goal/targetpypystandalone.py @@ -97,13 +97,16 @@ def create_entry_point(space, w_dict): from pypy.module.sys.initpath import pypy_find_stdlib verbose = rffi.cast(lltype.Signed, verbose) if ll_home: - home = rffi.charp2str(ll_home) + home1 = rffi.charp2str(ll_home) + home = os.path.join(home1, 'x') # <- so that 'll_home' can be + # directly the root directory else: - home = pypydir + home = home1 = pypydir w_path = pypy_find_stdlib(space, home) if space.is_none(w_path): if verbose: - debug("Failed to find library based on pypy_find_stdlib") + debug("pypy_setup_home: directories 'lib-python' and 'lib_pypy'" + " not found in '%s' or in any parent directory" % home1) return rffi.cast(rffi.INT, 1) space.startup() space.call_function(w_pathsetter, w_path) |