summaryrefslogtreecommitdiff
path: root/user/clang/0008-Fix-ClangConfig-cmake-LLVM-path.patch
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-09-15 20:01:45 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-09-15 20:01:45 +0000
commit8642108eae6cbb08930c10a883407a7ec2b2be1f (patch)
treed07f274152fd85a060cb72bf31ac70951804a79d /user/clang/0008-Fix-ClangConfig-cmake-LLVM-path.patch
parentde7967e51d8a8b525054bca4dd72dae1b32a48dd (diff)
downloadpackages-8642108eae6cbb08930c10a883407a7ec2b2be1f.tar.gz
packages-8642108eae6cbb08930c10a883407a7ec2b2be1f.tar.bz2
packages-8642108eae6cbb08930c10a883407a7ec2b2be1f.tar.xz
packages-8642108eae6cbb08930c10a883407a7ec2b2be1f.zip
Bump LLVM and Clang to 6.0.1, move to user/
Diffstat (limited to 'user/clang/0008-Fix-ClangConfig-cmake-LLVM-path.patch')
-rw-r--r--user/clang/0008-Fix-ClangConfig-cmake-LLVM-path.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/user/clang/0008-Fix-ClangConfig-cmake-LLVM-path.patch b/user/clang/0008-Fix-ClangConfig-cmake-LLVM-path.patch
new file mode 100644
index 000000000..f1c1c2449
--- /dev/null
+++ b/user/clang/0008-Fix-ClangConfig-cmake-LLVM-path.patch
@@ -0,0 +1,25 @@
+From: Adeel <adeelbm@outlook.com>
+Date: Sun, 6 May 2018 10:22:00 +0200
+Subject: [PATCH] Fix ClangConfig.cmake to look for LLVM-Config.cmake in correct location
+
+This results in the following change in the generated ClangConfig.cmake:
+
+ find_package(LLVM REQUIRED CONFIG
+ - HINTS "${CLANG_INSTALL_PREFIX}/lib/cmake/llvm")
+ + HINTS "/usr/lib/llvm5/lib/cmake/llvm")
+
+This is needed e.g. for building lldb.
+
+See https://github.com/alpinelinux/aports/pull/2342 for more information.
+
+--- a/cmake/modules/CMakeLists.txt
++++ b/cmake/modules/CMakeLists.txt
+@@ -39,7 +39,7 @@ foreach(p ${_count})
+ get_filename_component(CLANG_INSTALL_PREFIX \"\${CLANG_INSTALL_PREFIX}\" PATH)")
+ endforeach(p)
+ set(CLANG_CONFIG_CMAKE_DIR "\${CLANG_INSTALL_PREFIX}/${CLANG_INSTALL_PACKAGE_DIR}")
+-set(CLANG_CONFIG_LLVM_CMAKE_DIR "\${CLANG_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}")
++set(CLANG_CONFIG_LLVM_CMAKE_DIR "${llvm_cmake_builddir}")
+ set(CLANG_CONFIG_EXPORTS_FILE "\${CLANG_CMAKE_DIR}/ClangTargets.cmake")
+ set(CLANG_CONFIG_INCLUDE_DIRS
+ "\${CLANG_INSTALL_PREFIX}/include"