2 setup.py | 15 ++-------------
3 1 file changed, 2 insertions(+), 13 deletions(-)
7 @@ -368,11 +368,6 @@ class PyBuildExt(build_ext):
10 def detect_modules(self):
11 - # Ensure that /usr/local is always used
12 - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
13 - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
14 - self.add_multiarch_paths()
16 # Add paths specified in the environment variables LDFLAGS and
17 # CPPFLAGS for header and library files.
18 # We must get the values from the Makefile and not the environment
19 @@ -407,17 +402,6 @@ class PyBuildExt(build_ext):
20 for directory in reversed(options.dirs):
21 add_dir_to_list(dir_list, directory)
23 - if os.path.normpath(sys.prefix) != '/usr' \
24 - and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
25 - # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
26 - # (PYTHONFRAMEWORK is set) to avoid # linking problems when
27 - # building a framework with different architectures than
28 - # the one that is currently installed (issue #7473)
29 - add_dir_to_list(self.compiler.library_dirs,
30 - sysconfig.get_config_var("LIBDIR"))
31 - add_dir_to_list(self.compiler.include_dirs,
32 - sysconfig.get_config_var("INCLUDEDIR"))
35 have_unicode = unicode
37 @@ -426,11 +410,8 @@ class PyBuildExt(build_ext):
38 # lib_dirs and inc_dirs are used to search for files;
39 # if a file is found in one of those directories, it can
40 # be assumed that no additional -I,-L directives are needed.
41 - lib_dirs = self.compiler.library_dirs + [
42 - '/lib64', '/usr/lib64',
45 - inc_dirs = self.compiler.include_dirs + ['/usr/include']
46 + lib_dirs = self.compiler.library_dirs
47 + inc_dirs = self.compiler.include_dirs