@@ -44,7 +44,7 @@ def BuildOptions():
4444 other_group .add_argument ("-j" ,
4545 type = int ,
4646 help = 'Ninja -j option for RBE builds.' ,
47- default = 200 if sys .platform == 'win32' else 1000 )
47+ default = 200 if sys .platform == 'win32' else 500 )
4848 other_group .add_argument ("-l" ,
4949 type = int ,
5050 help = 'Ninja -l option for RBE builds.' ,
@@ -134,10 +134,12 @@ def UseRBE(out_dir):
134134def StartRBE (out_dir , env ):
135135 global rbe_started , bootstrap_path
136136 if not rbe_started :
137- if utils .IsWindows ():
138- rbe_dir = 'buildtools/reclient-win'
137+ if HOST_OS == 'win32' :
138+ rbe_dir = 'buildtools/reclient-win'
139+ elif HOST_OS == 'linux' :
140+ rbe_dir = 'buildtools/reclient-linux'
139141 else :
140- rbe_dir = 'buildtools/reclient'
142+ rbe_dir = 'buildtools/reclient'
141143 with open (os .path .join (out_dir , 'args.gn' ), 'r' ) as fp :
142144 for line in fp :
143145 if 'rbe_dir' in line :
@@ -300,6 +302,11 @@ def Main():
300302 env .pop ('LIBRARY_PATH' , None )
301303 env .pop ('SDKROOT' , None )
302304
305+ # Help QEMU binfmt work for executables that include dynamic links, such as
306+ # reclient's scandeps_server.
307+ if sys .platform == 'linux' :
308+ env ['QEMU_LD_PREFIX' ] = "/usr/x86_64-linux-gnu/"
309+
303310 # Always run GN before building.
304311 gn_py .RunGnOnConfiguredConfigurations (options , env )
305312
0 commit comments