mirror of
https://git.freebsd.org/ports.git
synced 2025-07-06 20:09:14 -04:00
24 lines
976 B
Python
24 lines
976 B
Python
--- tools/protoc_wrapper/protoc_wrapper.py.orig 2022-07-28 04:37:35 UTC
|
|
+++ tools/protoc_wrapper/protoc_wrapper.py
|
|
@@ -182,15 +182,19 @@ def main(argv):
|
|
if not options.exclude_imports:
|
|
protoc_cmd += ["--include_imports"]
|
|
|
|
+ nenv = os.environ.copy()
|
|
+ nenv["PATH"] = "${WRKOBJDIR}/bin:" + nenv["PATH"]
|
|
+ nenv["LD_LIBRARY_PATH"] = "${WRKSRC}/out/Release"
|
|
+
|
|
dependency_file_data = None
|
|
if options.descriptor_set_out and options.descriptor_set_dependency_file:
|
|
protoc_cmd += ['--dependency_out', options.descriptor_set_dependency_file]
|
|
- ret = subprocess.call(protoc_cmd)
|
|
+ ret = subprocess.call(protoc_cmd, env=nenv)
|
|
|
|
with open(options.descriptor_set_dependency_file, 'rb') as f:
|
|
dependency_file_data = f.read().decode('utf-8')
|
|
|
|
- ret = subprocess.call(protoc_cmd)
|
|
+ ret = subprocess.call(protoc_cmd, env=nenv)
|
|
if ret != 0:
|
|
if ret <= -100:
|
|
# Windows error codes such as 0xC0000005 and 0xC0000409 are much easier to
|