mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 21:09:03 +02:00
ed141a08b3
Remove patches that are present in this version of llvm and backport a fix to prevent linking errors. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
52 lines
1.4 KiB
Diff
52 lines
1.4 KiB
Diff
From 455ce9c25df5313f4a6649cc27075bdfbe25af18 Mon Sep 17 00:00:00 2001
|
|
From: Naveen Saini <naveen.kumar.saini@intel.com>
|
|
Date: Wed, 21 Aug 2019 14:35:31 +0800
|
|
Subject: [PATCH] llvm-spirv: skip building 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 <anuj.mittal@intel.com>
|
|
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
|
|
---
|
|
CMakeLists.txt | 10 ----------
|
|
1 file changed, 10 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index b718c00..9805140 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -24,13 +24,6 @@ if(LLVM_SPIRV_BUILD_EXTERNAL)
|
|
set(CMAKE_CXX_STANDARD 14)
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
|
|
- if(LLVM_SPIRV_INCLUDE_TESTS)
|
|
- set(LLVM_TEST_COMPONENTS
|
|
- llvm-as
|
|
- llvm-dis
|
|
- )
|
|
- endif(LLVM_SPIRV_INCLUDE_TESTS)
|
|
-
|
|
find_package(LLVM 10.0.0 REQUIRED
|
|
COMPONENTS
|
|
Analysis
|
|
@@ -61,9 +54,6 @@ set(LLVM_SPIRV_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
|
|
|
|
add_subdirectory(lib/SPIRV)
|
|
add_subdirectory(tools/llvm-spirv)
|
|
-if(LLVM_SPIRV_INCLUDE_TESTS)
|
|
- add_subdirectory(test)
|
|
-endif(LLVM_SPIRV_INCLUDE_TESTS)
|
|
|
|
install(
|
|
FILES
|
|
--
|
|
2.7.4
|
|
|