From ef12246e320ab97da538253c95c5c509c979bbf0 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 30 Mar 2023 19:50:04 +0100 Subject: [PATCH] llvm: remove redundant CMake variables This recipe uses the cmake class, so there's no need to set the Ninja backend, or tell it where Python is, or that we're cross-compiling. (From OE-Core rev: 2560665cc1e30a6ca969118ade8612393e1eef74) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/llvm/llvm_git.bb | 3 +-- meta/recipes-devtools/rust/rust-llvm_1.67.1.bb | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index f133653903..f617b17231 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -82,9 +82,8 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \ -DLLVM_OPTIMIZED_TABLEGEN=ON \ -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS}' \ -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \ - -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ -DCMAKE_BUILD_TYPE=Release \ - -G Ninja" + " EXTRA_OECMAKE:append:class-target = "\ -DCMAKE_CROSSCOMPILING:BOOL=ON \ diff --git a/meta/recipes-devtools/rust/rust-llvm_1.67.1.bb b/meta/recipes-devtools/rust/rust-llvm_1.67.1.bb index 4da11da8ef..6304070deb 100644 --- a/meta/recipes-devtools/rust/rust-llvm_1.67.1.bb +++ b/meta/recipes-devtools/rust/rust-llvm_1.67.1.bb @@ -49,14 +49,12 @@ EXTRA_OECMAKE = " \ -DCMAKE_INSTALL_PREFIX:PATH=${libdir}/llvm-rust \ " EXTRA_OECMAKE:append:class-target = "\ - -DCMAKE_CROSSCOMPILING:BOOL=ON \ -DLLVM_BUILD_TOOLS=OFF \ -DLLVM_TABLEGEN=${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-tblgen \ -DLLVM_CONFIG_PATH=${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-config \ " EXTRA_OECMAKE:append:class-nativesdk = "\ - -DCMAKE_CROSSCOMPILING:BOOL=ON \ -DLLVM_BUILD_TOOLS=OFF \ -DLLVM_TABLEGEN=${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-tblgen \ -DLLVM_CONFIG_PATH=${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-config \