blob: 30a9675252682c9f900b79a2c1d485eb86a43b6a (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
--- src/3rdparty/chromium/tools/protoc_wrapper/protoc_wrapper.py.orig 2023-10-11 18:22:24 UTC
+++ src/3rdparty/chromium/tools/protoc_wrapper/protoc_wrapper.py
@@ -179,15 +179,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
|
