2 files changed, 56 insertions, 5 deletions
diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt
index 06b951767..288de8117 100644
--- a/sources/shiboken2/CMakeLists.txt
+++ b/sources/shiboken2/CMakeLists.txt
@@ -42,6 +42,22 @@ if (NOT PYTHON_ARCH)
     get_python_arch()
 endif()
 
+macro(get_llvm_config)
+  execute_process(
+    COMMAND ${PYTHON_EXECUTABLE} -c "if True:
+       import os
+       import sys
+       sys.path.append(os.path.realpath(os.path.join('${CMAKE_CURRENT_LIST_DIR}', '..', '..')))
+       from utils import findLlvmConfig
+       llvmConfig = findLlvmConfig()
+       if llvmConfig:
+           print(llvmConfig)
+       "
+    OUTPUT_VARIABLE LLVM_CONFIG
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  message("LLMV_CONFIG:             " ${LLVM_CONFIG})
+endmacro()
+
 set(CLANG_DIR "")
 set(CLANG_DIR_SOURCE "")
 
@@ -54,12 +70,15 @@ elseif (DEFINED ENV{CLANG_INSTALL_DIR})
     string(REPLACE "_ARCH_" "${PYTHON_ARCH}" CLANG_DIR "${CLANG_DIR}")
     set(CLANG_DIR_SOURCE "CLANG_INSTALL_DIR")
 else ()
-    EXEC_PROGRAM("llvm-config" ARGS "--prefix" OUTPUT_VARIABLE CLANG_DIR)
-    set(CLANG_DIR_SOURCE "llvm-config")
+    if (NOT LLVM_CONFIG)
+        get_llvm_config()
+    endif()
+    set(CLANG_DIR_SOURCE "${LLVM_CONFIG}")
+    EXEC_PROGRAM("${LLVM_CONFIG}" ARGS "--prefix" OUTPUT_VARIABLE CLANG_DIR)
     if (NOT "${CLANG_DIR}" STREQUAL "")
-        EXEC_PROGRAM("llvm-config" ARGS "--version" OUTPUT_VARIABLE CLANG_VERSION)
+        EXEC_PROGRAM("${LLVM_CONFIG}" ARGS "--version" OUTPUT_VARIABLE CLANG_VERSION)
         if (CLANG_VERSION VERSION_LESS 3.9)
-            message(FATAL_ERROR "LLVM version 3.9 is required (llvm-config detected ${CLANG_VERSION} at ${CLANG_DIR}).")
+            message(FATAL_ERROR "LLVM version 3.9 is required (${LLVM_CONFIG} detected ${CLANG_VERSION} at ${CLANG_DIR}).")
         endif()
     endif()
 endif()
diff --git a/utils.py b/utils.py
index cbd19c207..75ff2d851 100644
--- a/utils.py
+++ b/utils.py
@@ -46,6 +46,7 @@ import time
 import shutil
 import subprocess
 import fnmatch
+import glob
 import itertools
 import popenasync
 
@@ -660,6 +661,37 @@ def osx_localize_libpaths(libpath, local_libs, enc_path=None):
         back_tick('install_name_tool -add_rpath {epa} {lipa}'.format(
                   epa=enc_path, lipa=libpath ))
 
+# Find an executable specified by a glob pattern ('foo*') in the OS path
+def findGlobInPath(pattern):
+    result = []
+    if sys.platform == 'win32':
+        pattern += '.exe'
+
+    for path in os.environ.get('PATH', '').split(os.pathsep):
+        for match in glob.glob(os.path.join(path, pattern)):
+            result.append(match)
+    return result
+
+# Locate the most recent version of llvmConfig in the path.
+def findLlvmConfig():
+    versionRe = re.compile('(\d+)\.(\d+)\.(\d+)')
+    result = None
+    lastVersionString = '000000'
+    for llvmConfig in findGlobInPath('llvm-config*'):
+        try:
+            output = run_process_output([llvmConfig, '--version'])
+            if output:
+                match = versionRe.match(output[0])
+                if match:
+                    versionString = '%02d%02d%02d' % (int(match.group(1)),
+                                    int(match.group(2)), int(match.group(3)))
+                    if (versionString > lastVersionString):
+                        result = llvmConfig
+                        lastVersionString = versionString
+        except OSError:
+            pass
+    return result
+
 # Add Clang to path for Windows for the shiboken ApiExtractor tests.
 # Revisit once Clang is bundled with Qt.
 def detectClang():
@@ -669,7 +701,7 @@ def detectClang():
         source = 'CLANG_INSTALL_DIR'
         clangDir = os.environ.get(source, None)
         if not clangDir:
-            source = 'llvm-config'
+            source = findLlvmConfig()
             try:
                 output = run_process_output([source, '--prefix'])
                 if output: