f358f322da
* Rebase patches to Buildroot 2021.02-rc3 * Update Buildroot to 2021.02-rc3 * Declare Kernel headers to be Linux version 5.10 (since they are, and new Buildroot knows about 5.10)
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From 268815d74ea34856c686dce9e9c23106b51f2782 Mon Sep 17 00:00:00 2001
|
|
From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
|
|
Date: Tue, 2 Feb 2021 21:46:29 +0100
|
|
Subject: [PATCH] CMakeLists.txt: fix cross-compilation with
|
|
gRPC_BUILD_GRPC_CPP_PLUGIN=OFF
|
|
|
|
When cross-compiling gRPC, a native version of 'grpc_cpp_plugin' is searched
|
|
in the environment. For most use cases, a cross version of this file is not
|
|
needed.
|
|
|
|
However, when cross-building with -DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF, there
|
|
are some build errors, for example:
|
|
|
|
make[3]: *** No rule to make target 'grpc_cpp_plugin', needed by 'gens/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc'. Stop.
|
|
|
|
This is because there is still a hard dependency on 'grpc_cpp_plugin' for
|
|
these targets, not taking into account the cross-compilation case.
|
|
|
|
Fix by depending on the variable gRPC_CPP_PLUGIN, which is set correctly for
|
|
either cross or native case.
|
|
|
|
Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
|
|
|
|
---
|
|
CMakeLists.txt | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 6bdae22083..08aea609f7 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -317,7 +317,7 @@ function(protobuf_generate_grpc_cpp)
|
|
--plugin=protoc-gen-grpc=${_gRPC_CPP_PLUGIN}
|
|
${_protobuf_include_path}
|
|
${REL_FIL}
|
|
- DEPENDS ${ABS_FIL} ${_gRPC_PROTOBUF_PROTOC} grpc_cpp_plugin
|
|
+ DEPENDS ${ABS_FIL} ${_gRPC_PROTOBUF_PROTOC} ${_gRPC_CPP_PLUGIN}
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
COMMENT "Running gRPC C++ protocol buffer compiler on ${FIL}"
|
|
VERBATIM)
|
|
--
|
|
2.26.2
|
|
|