diff options
author | Georg Brandl <georg@python.org> | 2007-03-13 10:19:22 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2007-03-13 10:19:22 (GMT) |
commit | 18c47f6a3b3cc848dc2fc09329954378e483dce1 (patch) | |
tree | c2d4986af4e762757655b385ea5770fbcfb4501f /Lib/distutils | |
parent | b6a87542b301e54872807940f71c06be9f03f990 (diff) | |
download | cpython-18c47f6a3b3cc848dc2fc09329954378e483dce1.zip cpython-18c47f6a3b3cc848dc2fc09329954378e483dce1.tar.gz cpython-18c47f6a3b3cc848dc2fc09329954378e483dce1.tar.bz2 |
Patch #1569798: fix a bug in distutils when building Python from a
directory within sys.exec_prefix.
Diffstat (limited to 'Lib/distutils')
-rw-r--r-- | Lib/distutils/command/build_ext.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index 542b77a..82474de 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -186,7 +186,7 @@ class build_ext (Command): # for extensions under Cygwin and AtheOS Python's library directory must be # appended to library_dirs if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos': - if string.find(sys.executable, sys.exec_prefix) != -1: + if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")): # building third party extensions self.library_dirs.append(os.path.join(sys.prefix, "lib", "python" + get_python_version(), @@ -199,7 +199,7 @@ class build_ext (Command): # Python's library directory must be appended to library_dirs if (sys.platform.startswith('linux') or sys.platform.startswith('gnu')) \ and sysconfig.get_config_var('Py_ENABLE_SHARED'): - if string.find(sys.executable, sys.exec_prefix) != -1: + if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")): # building third party extensions self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) else: |