Commit | Line | Data |
---|---|---|
2073b55e | 1 | Make sure the build system honors C_INCLUDE_PATH and LIBRARY_PATH when |
a2ab82db | 2 | looking for headers and libraries. |
6a20289d | 3 | |
4e3a7d84 MB |
4 | --- a/setup.py 2015-10-07 23:32:58.891329173 +0200 |
5 | +++ b/setup.py 2015-10-07 23:46:29.653349924 +0200 | |
b15d1c46 | 6 | @@ -676,15 +676,15 @@ |
6a20289d LC |
7 | # if a file is found in one of those directories, it can |
8 | # be assumed that no additional -I,-L directives are needed. | |
b15d1c46 MB |
9 | if not CROSS_COMPILING: |
10 | - self.lib_dirs = self.compiler.library_dirs + system_lib_dirs | |
11 | - self.inc_dirs = self.compiler.include_dirs + system_include_dirs | |
12 | + self.lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep) | |
2073b55e | 13 | + self.inc_dirs = os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) |
6a20289d | 14 | else: |
5c798ca7 MB |
15 | # Add the sysroot paths. 'sysroot' is a compiler option used to |
16 | # set the logical path of the standard system headers and | |
ceb9de75 | 17 | # libraries. |
b15d1c46 MB |
18 | - self.lib_dirs = (self.compiler.library_dirs + |
19 | + self.lib_dirs = (os.getenv('CROSS_LIBRARY_PATH', '').split(os.pathsep) + | |
20 | sysroot_paths(('LDFLAGS', 'CC'), system_lib_dirs)) | |
21 | - self.inc_dirs = (self.compiler.include_dirs + | |
bda4b5e0 | 22 | + self.inc_dirs = (os.getenv('CROSS_C_INCLUDE_PATH', '').split(os.pathsep) + |
b15d1c46 MB |
23 | sysroot_paths(('CPPFLAGS', 'CFLAGS', 'CC'), |
24 | system_include_dirs)) | |
25 |