From 8e30c8b6337c399fc744965891d63245aef370e3 Mon Sep 17 00:00:00 2001
From: Sergei Nikulov <snikulov@users.noreply.github.com>
Date: Mon, 17 Aug 2020 11:26:03 +0300
Subject: [PATCH] build: fixed issue with clang includes detection (issue
 #1058) (#1064)

---
 CMakeLists.txt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b60eaaa6..f35e1b1b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,7 +138,17 @@ if (BUILD_CXX_LANGUAGE_PACKAGE)
 	set (CLANG_COMPILER_HEADER_SEARCH_PATH "")
 	foreach(LLVM_CONFIGURATION_TYPE ${LLVM_CONFIGURATION_TYPES})
 		if (CLANG_COMPILER_HEADER_SEARCH_PATH STREQUAL "")
-			set (CLANG_COMPILER_HEADER_SEARCH_PATH "${LLVM_BINARY_DIR}/${LLVM_CONFIGURATION_TYPE}/lib/clang/${LLVM_VERSION}/include")
+			set (_CLANG_HEADERS_SEARCH_LIST
+				"${LLVM_BINARY_DIR}/${LLVM_CONFIGURATION_TYPE}/lib/clang/${LLVM_VERSION}/include"
+				"${LLVM_BINARY_DIR}/${LLVM_CONFIGURATION_TYPE}/lib64/clang/${LLVM_VERSION}/include"
+			)
+			foreach (_CLANG_HEADER_PATH ${_CLANG_HEADERS_SEARCH_LIST})
+				if (EXISTS ${_CLANG_HEADER_PATH})
+					set (CLANG_COMPILER_HEADER_SEARCH_PATH ${_CLANG_HEADER_PATH})
+					break ()
+				endif ()
+			endforeach ()
+
 			message (STATUS "Trying to find Clang compiler headers in '${LLVM_CONFIGURATION_TYPE}' build config in directory '${CLANG_COMPILER_HEADER_SEARCH_PATH}'.")
 			if (EXISTS ${CLANG_COMPILER_HEADER_SEARCH_PATH})
 				message (STATUS "Found headers for '${LLVM_CONFIGURATION_TYPE}' build config.")