From 9804b5a0e974a33cd65dab2f33f8c66c8f67064a Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 16 Aug 2019 22:22:33 +0800 Subject: llvm-spirv: update to sync with opencl-clang Also include a patch to not build tests to prevent passing the build flag to every component that is built out of tree. Signed-off-by: Anuj Mittal --- .../clang/files/0001-skip-building-tests.patch | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-skip-building-tests.patch (limited to 'dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-skip-building-tests.patch') diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-skip-building-tests.patch b/dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-skip-building-tests.patch new file mode 100644 index 00000000..c58e7d98 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-skip-building-tests.patch @@ -0,0 +1,50 @@ +From 91db4c3cf7f290a3cab5caa316fc25a60dd409f1 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +Date: Fri, 16 Aug 2019 20:25:16 +0800 +Subject: [PATCH] llvm-spirv: skip including tests + +Some of these need clang to be built and since we're building this in-tree, +that leads to problems when compiling libcxx, compiler-rt which aren't built +in-tree. + +Instead of using SPIRV_SKIP_CLANG_BUILD to skip clang build and adding this to +all components, disable the building of tests altogether. + +Upstream-Status: Inappropriate + +Signed-off-by: Anuj Mittal +--- + CMakeLists.txt | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d632a50..81ddf62 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,13 +15,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + +- if(LLVM_INCLUDE_TESTS) +- set(LLVM_TEST_COMPONENTS +- llvm-as +- llvm-dis +- ) +- endif(LLVM_INCLUDE_TESTS) +- + find_package(LLVM 8.0.0 REQUIRED + COMPONENTS + Analysis +@@ -56,9 +49,6 @@ set(LLVM_SPIRV_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include) + + add_subdirectory(lib/SPIRV) + add_subdirectory(tools/llvm-spirv) +-if(LLVM_INCLUDE_TESTS) +- add_subdirectory(test) +-endif(LLVM_INCLUDE_TESTS) + + install( + FILES +-- +2.7.4 + -- cgit v1.2.3-54-g00ecf