diff -r d3cda8cf4d42 setup.py --- a/setup.py Mon Aug 17 22:10:47 2015 -0400 +++ b/setup.py Fri Aug 21 15:27:34 2015 -0500 @@ -35,12 +35,15 @@ # This global variable is used to hold the list of modules to be disabled. disabled_module_list = [] -def add_dir_to_list(dirlist, dir): +def add_dir_to_list(dirlist, dir, front=True): """Add the directory 'dir' to the list 'dirlist' (at the front) if 1) 'dir' is not already in 'dirlist' 2) 'dir' actually exists, and is a directory.""" if dir is not None and os.path.isdir(dir) and dir not in dirlist: - dirlist.insert(0, dir) + if front == True: + dirlist.insert(0, dir) + else: + dirlist.append(dir) def macosx_sdk_root(): """ @@ -399,9 +402,9 @@ with open(tmpfile) as fp: multiarch_path_component = fp.readline().strip() add_dir_to_list(self.compiler.library_dirs, - '/usr/lib/' + multiarch_path_component) + '/usr/lib/' + multiarch_path_component, False) add_dir_to_list(self.compiler.include_dirs, - '/usr/include/' + multiarch_path_component) + '/usr/include/' + multiarch_path_component, False) finally: os.unlink(tmpfile) @@ -440,8 +443,8 @@ def detect_modules(self): # Ensure that /usr/local is always used if not cross_compiling: - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib', False) + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include', False) if cross_compiling: self.add_gcc_paths() self.add_multiarch_paths() @@ -505,12 +508,12 @@ for d in ( '/usr/include', ): - add_dir_to_list(inc_dirs, d) + add_dir_to_list(inc_dirs, d, False) for d in ( '/lib64', '/usr/lib64', '/lib', '/usr/lib', ): - add_dir_to_list(lib_dirs, d) + add_dir_to_list(lib_dirs, d, False) exts = [] missing = []