From 5a3c3bdd99a34d6df4ae9d7db91b60f000e1a349 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Thu, 22 Aug 2019 13:41:51 -0400
Subject: [PATCH] working on race condition for grpc build
---
SConstruct | 2 +-
tools/protoc.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/SConstruct b/SConstruct
index 8b19a07..30cf1d6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -19,7 +19,7 @@ env = Environment(
env['PROTOCCPPOUTDIR'] = env['TURBO_HOME'] + "/turbo-rpc"
env['PROTOCGRPCOUTDIR'] = env['TURBO_HOME'] + "/turbo-rpc"
env['PROTOCPROTOPATH'] = '.'
-env['PROTOCCOM'] = '$PROTOC ${["-I%s"%x for x in PROTOCPROTOPATH]} $PROTOCFLAGS --proto_path=$PWD --cpp_out='+env['TURBO_HOME']+' --grpc_out='+env['TURBO_HOME']+' --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` ${SOURCES} '
+env['PROTOCCOM'] = '$PROTOC ${["-I%s"%x for x in PROTOCPROTOPATH]} $PROTOCFLAGS --proto_path=$PWD --cpp_out='+env['TURBO_HOME']+' --grpc_out='+env['TURBO_HOME']+' --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` ${SOURCES} ; echo protoc complete'
Export('env')
diff --git a/tools/protoc.py b/tools/protoc.py
index 51f1ca4..edca384 100755
--- a/tools/protoc.py
+++ b/tools/protoc.py
@@ -57,10 +57,10 @@ def generate(env):
bld = ProtocBuilder
env['BUILDERS']['protoc'] = bld
- env['PROTOC'] = 'pwd; ' + (env.Detect(protocs) or 'protoc')
+ env['PROTOC'] = 'pwd; ' + (env.Detect(protocs) or 'protoc')
env['PROTOCFLAGS'] = SCons.Util.CLVar('')
env['PROTOCPROTOPATH'] = SCons.Util.CLVar('')
- env['PROTOCCOM'] = '$PROTOC ${["-I%s"%x for x in PROTOCPROTOPATH]} $PROTOCFLAGS --cpp_out=$PROTOCCPPOUTFLAGS$PROTOCOUTDIR ${PROTOCPYTHONOUTDIR and ("--python_out="+PROTOCPYTHONOUTDIR) or ""} ${PROTOCFDSOUT and ("-o"+PROTOCFDSOUT) or ""} ${SOURCES}'
+ env['PROTOCCOM'] = '$PROTOC ${["-I%s"%x for x in PROTOCPROTOPATH]} $PROTOCFLAGS --cpp_out=$PROTOCCPPOUTFLAGS$PROTOCOUTDIR ${PROTOCPYTHONOUTDIR and ("--python_out="+PROTOCPYTHONOUTDIR) or ""} ${PROTOCFDSOUT and ("-o"+PROTOCFDSOUT) or ""} ${SOURCES}; echo protoc complete'
env['PROTOCOUTDIR'] = '${SOURCE.dir}'
env['PROTOCPYTHONOUTDIR'] = "python"
env['PROTOCSRCSUFFIX'] = '.proto'
--
GitLab