gem5-dev@gem5.org

The gem5 Developer List

View all threads

[XS] Change in gem5/gem5[release-staging-v23-0]: scons: Fix grpc protobuf actions

BB
Bobby Bruce (Gerrit)
Tue, Jun 6, 2023 10:29 PM

Bobby Bruce has uploaded this change for review. (
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

M src/SConscript
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/SConscript b/src/SConscript
index 13f08d2..efc1477 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: newchange
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v23-0
Gerrit-Change-Id: I259413f7739f89598dcd42c3f2e1e865cec3de43
Gerrit-Change-Number: 71338
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby Bruce bbruce@ucdavis.edu
Gerrit-CC: Roger Chang rogerycchang@google.com

Bobby Bruce has uploaded this change for review. ( 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 --- M src/SConscript 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SConscript b/src/SConscript index 13f08d2..efc1477 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: newchange Gerrit-Project: public/gem5 Gerrit-Branch: release-staging-v23-0 Gerrit-Change-Id: I259413f7739f89598dcd42c3f2e1e865cec3de43 Gerrit-Change-Number: 71338 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby Bruce <bbruce@ucdavis.edu> Gerrit-CC: Roger Chang <rogerycchang@google.com>