From ed141a08b3e7785142c9889177fadc65d4f583ef Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Mon, 23 Mar 2020 11:35:59 +0800 Subject: llvm-spirv: upgrade 9.0.0 -> 10.0.0 Remove patches that are present in this version of llvm and backport a fix to prevent linking errors. Signed-off-by: Anuj Mittal --- .../clang/files/0001-skip-building-tests.patch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (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 index 9a7b8445..8e58ec25 100644 --- 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 @@ -1,4 +1,4 @@ -From 48e50f06b1bbed94cdf5207587161d4bfce7366e Mon Sep 17 00:00:00 2001 +From 455ce9c25df5313f4a6649cc27075bdfbe25af18 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Wed, 21 Aug 2019 14:35:31 +0800 Subject: [PATCH] llvm-spirv: skip building tests @@ -19,33 +19,33 @@ Signed-off-by: Naveen Saini 1 file changed, 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1208741..20ca3e6 100644 +index b718c00..9805140 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) +@@ -24,13 +24,6 @@ if(LLVM_SPIRV_BUILD_EXTERNAL) + set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) -- if(LLVM_INCLUDE_TESTS) +- if(LLVM_SPIRV_INCLUDE_TESTS) - set(LLVM_TEST_COMPONENTS - llvm-as - llvm-dis - ) -- endif(LLVM_INCLUDE_TESTS) +- endif(LLVM_SPIRV_INCLUDE_TESTS) - - find_package(LLVM 9.0.0 REQUIRED + find_package(LLVM 10.0.0 REQUIRED COMPONENTS Analysis -@@ -56,9 +49,6 @@ set(LLVM_SPIRV_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include) +@@ -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_INCLUDE_TESTS) +-if(LLVM_SPIRV_INCLUDE_TESTS) - add_subdirectory(test) --endif(LLVM_INCLUDE_TESTS) +-endif(LLVM_SPIRV_INCLUDE_TESTS) install( FILES -- -2.17.1 +2.7.4 -- cgit v1.2.3-54-g00ecf