mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 18:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

llvm: Fix [compile-host-path] QA issue

Browse Source 
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 <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2018-04-20 09:33:54 -07:00
committed by Richard Purdie
parent a68dd429c2
commit 51394baea4
2 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch Normal file
View File

@@ -0,0 +1,41 @@
From 7f7743ce233fcd735ec580c75270413493658aa6 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
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 <raj.khem@gmail.com>
---
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 $<CONFIGURATION>
- 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

7
meta/recipes-devtools/llvm/llvm_git.bb
View File

@@ -26,6 +26,7 @@ PATCH_VERSION = "0"
SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH};protocol=http \
file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
file://0002-llvm-allow-env-override-of-exe-path.patch \
file://0001-Disable-generating-a-native-llvm-config.patch \
"
UPSTREAM_CHECK_COMMITS = "1"
S = "${WORKDIR}/git"
@@ -85,15 +86,15 @@ do_configure_prepend() {
}
do_compile() {
NINJA_STATUS="[%p] " ninja -v ${PARALLEL_MAKE}
ninja -v ${PARALLEL_MAKE}
}
do_compile_class-native() {
NINJA_STATUS="[%p] " ninja -v ${PARALLEL_MAKE} llvm-config llvm-tblgen
ninja -v ${PARALLEL_MAKE} llvm-config llvm-tblgen
}
do_install() {
NINJA_STATUS="[%p] " DESTDIR=${LLVM_INSTALL_DIR} ninja -v install
DESTDIR=${LLVM_INSTALL_DIR} ninja -v install
install -D -m 0755 ${B}/bin/llvm-config ${D}${libdir}/${LLVM_DIR}/llvm-config
install -d ${D}${bindir}/${LLVM_DIR}