From 51394baea4109ad130e0806848773734db0ca49f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Apr 2018 09:33:54 -0700 Subject: llvm: Fix [compile-host-path] QA issue Its trying to build NATIVE llvm-config which is already built with llvm-native so we do not need to rebuild it Drop setting NINJA_STATUS explicitly, its no longer needed, on the contrary it hinders the task status update (From OE-Core rev: f8393b2b4bc5fbd972be00cb17d0c574ae8deff9) Signed-off-by: Khem Raj Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...1-Disable-generating-a-native-llvm-config.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch (limited to 'meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch') diff --git a/meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch b/meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch new file mode 100644 index 0000000000..2809e4c594 --- /dev/null +++ b/meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch @@ -0,0 +1,41 @@ +From 7f7743ce233fcd735ec580c75270413493658aa6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 19 Apr 2018 18:08:31 -0700 +Subject: [PATCH] Disable generating a native llvm-config + +OpenEmbedded already builds this as part of llvm-native + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj +--- + tools/llvm-config/CMakeLists.txt | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt +index 25f99cec978..c45e9b642a8 100644 +--- a/tools/llvm-config/CMakeLists.txt ++++ b/tools/llvm-config/CMakeLists.txt +@@ -63,19 +63,3 @@ endif() + + # Add the dependency on the generation step. + add_file_dependencies(${CMAKE_CURRENT_SOURCE_DIR}/llvm-config.cpp ${BUILDVARIABLES_OBJPATH}) +- +-if(CMAKE_CROSSCOMPILING) +- set(${project}_LLVM_CONFIG_EXE "${LLVM_NATIVE_BUILD}/bin/llvm-config") +- set(${project}_LLVM_CONFIG_EXE ${${project}_LLVM_CONFIG_EXE} PARENT_SCOPE) +- +- add_custom_command(OUTPUT "${${project}_LLVM_CONFIG_EXE}" +- COMMAND ${CMAKE_COMMAND} --build . --target llvm-config --config $ +- DEPENDS ${LLVM_NATIVE_BUILD}/CMakeCache.txt +- WORKING_DIRECTORY ${LLVM_NATIVE_BUILD} +- COMMENT "Building native llvm-config..." +- USES_TERMINAL) +- add_custom_target(${project}NativeLLVMConfig DEPENDS ${${project}_LLVM_CONFIG_EXE}) +- add_dependencies(${project}NativeLLVMConfig CONFIGURE_LLVM_NATIVE) +- +- add_dependencies(llvm-config ${project}NativeLLVMConfig) +-endif(CMAKE_CROSSCOMPILING) +-- +2.17.0 + -- cgit v1.2.3-54-g00ecf