Bobby Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/71338?usp=email )
Change subject: scons: Fix grpc protobuf actions
..
scons: Fix grpc protobuf actions
The change will fix the proto import issue and build issue with
--no-duplicate-sources options, more details please reference:
https://gem5-review.googlesource.com/c/public/gem5/+/64491.
Change-Id: I259413f7739f89598dcd42c3f2e1e865cec3de43
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/71318
Reviewed-by: Jason Lowe-Power
Tested-by: kokoro
Maintainer: Jason Lowe-Power
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/71338
Reviewed-by: Bobby Bruce
Maintainer: Bobby Bruce
---
M src/SConscript
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/SConscript b/src/SConscript
index 13f08d2..d26bf49 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -280,9 +280,9 @@
root, ext = os.path.splitext(source[0].get_abspath())
return [root + '.grpc.pb.cc', root + '.grpc.pb.h'], source
-protoc_grpc_action=MakeAction('${PROTOC} --grpc_out ${BUILDDIR} '
-'--plugin=protoc-gen-grpc=${PROTOC_GRPC} --proto_path ${BUILDDIR} '
-'${SOURCE.get_abspath()}',
+protoc_grpc_action=MakeAction('${PROTOC} --grpc_out ${TARGET.dir.abspath} '
+'--plugin=protoc-gen-grpc=${PROTOC_GRPC} '
+'--proto_path ${SOURCE.dir.abspath} ${SOURCE.abspath}',
Transform("PROTOC"))
env.Append(BUILDERS={'GrpcProtoBufCC' : Builder(
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/71338?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v23-0
Gerrit-Change-Id: I259413f7739f89598dcd42c3f2e1e865cec3de43
Gerrit-Change-Number: 71338
Gerrit-PatchSet: 4
Gerrit-Owner: Bobby Bruce
Gerrit-Reviewer: Bobby Bruce
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
Gerrit-CC: Roger Chang
Gerrit-CC: kokoro
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
