[Python-checkins] bpo-11063: Handle uuid.h being in default include path (GH-4565)

[Nick Coghlan]

https://github.com/python/cpython/commit/53efbf3977a44e382397e7994a2524b4f8c9d053
commit: 53efbf3977a44e382397e7994a2524b4f8c9d053
branch: master
author: Nick Coghlan <ncoghlan at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-11-26T13:04:46+10:00
summary:

bpo-11063: Handle uuid.h being in default include path (GH-4565)

find_file() returns an empty list if it finds the requested
header on the standard include path, so header existence
checks need to be explicitly against "is not None".

files:
M setup.py

diff --git a/setup.py b/setup.py
index 0678ddec414..c22de17f953 100644
--- a/setup.py
+++ b/setup.py
@@ -1680,12 +1680,11 @@ class db_found(Exception): pass
 
         # Build the _uuid module if possible
         uuid_incs = find_file("uuid.h", inc_dirs, ["/usr/include/uuid"])
-        if uuid_incs:
+        if uuid_incs is not None:
             if self.compiler.find_library_file(lib_dirs, 'uuid'):
                 uuid_libs = ['uuid']
             else:
                 uuid_libs = []
-        if uuid_incs:
             self.extensions.append(Extension('_uuid', ['_uuidmodule.c'],
                                    libraries=uuid_libs,
                                    include_dirs=uuid_incs))