File tree 3 files changed +11
-9
lines changed
buildbot/osuosl/master/config
3 files changed +11
-9
lines changed Original file line number Diff line number Diff line change 217
217
extra_configure_args = [
218
218
"-DLLVM_TARGETS_TO_BUILD=ARM" ,
219
219
"-DTOOLCHAIN_TARGET_TRIPLE=armv7-unknown-linux-gnueabihf" ,
220
- "-DDEFAULT_SYSROOT=C:/buildbot/.arm-ubuntu" ,
221
- "-DZLIB_ROOT=C:/buildbot/.zlib-win32" ,
220
+ WithProperties ( "-DCLANG_CONFIG_FILE_USER_DIR=%(clang_configs_path)s" ) ,
221
+ WithProperties ( "-DZLIB_ROOT=%(zlib_root_path)s" ) ,
222
222
"-DLLVM_LIT_ARGS=-v -vv --threads=32" ,
223
223
WithProperties ("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s" ),
224
224
WithProperties ("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s" ),
256
256
extra_configure_args = [
257
257
"-DLLVM_TARGETS_TO_BUILD=AArch64" ,
258
258
"-DTOOLCHAIN_TARGET_TRIPLE=aarch64-unknown-linux-gnu" ,
259
- WithProperties ("-DDEFAULT_SYSROOT =%(sysroot_path_aarch64 )s" ),
259
+ WithProperties ("-DCLANG_CONFIG_FILE_USER_DIR =%(clang_configs_path )s" ),
260
260
WithProperties ("-DZLIB_ROOT=%(zlib_root_path)s" ),
261
261
"-DLLVM_LIT_ARGS=-v -vv --threads=32" ,
262
262
WithProperties ("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s" ),
Original file line number Diff line number Diff line change 131
131
extra_configure_args = [
132
132
"-DLLVM_TARGETS_TO_BUILD=ARM" ,
133
133
"-DTOOLCHAIN_TARGET_TRIPLE=armv7-unknown-linux-gnueabihf" ,
134
- "-DDEFAULT_SYSROOT=C:/buildbot/.arm-ubuntu" ,
135
- "-DZLIB_ROOT=C:/buildbot/.zlib-win32" ,
134
+ WithProperties ( "-DCLANG_CONFIG_FILE_USER_DIR=%(clang_configs_path)s" ) ,
135
+ WithProperties ( "-DZLIB_ROOT=%(zlib_root_path)s" ) ,
136
136
"-DLLVM_LIT_ARGS=-v -vv --threads=32" ,
137
137
WithProperties ("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s" ),
138
138
WithProperties ("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s" ),
170
170
extra_configure_args = [
171
171
"-DLLVM_TARGETS_TO_BUILD=AArch64" ,
172
172
"-DTOOLCHAIN_TARGET_TRIPLE=aarch64-unknown-linux-gnu" ,
173
- WithProperties ("-DDEFAULT_SYSROOT =%(sysroot_path_aarch64 )s" ),
173
+ WithProperties ("-DCLANG_CONFIG_FILE_USER_DIR =%(clang_configs_path )s" ),
174
174
WithProperties ("-DZLIB_ROOT=%(zlib_root_path)s" ),
175
175
"-DLLVM_LIT_ARGS=-v -vv --threads=32" ,
176
176
WithProperties ("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s" ),
Original file line number Diff line number Diff line change @@ -178,16 +178,18 @@ def get_all():
178
178
179
179
# Windows Server on Xeon Gold 6130 (2x2.1GHz), 128Gb of RAM
180
180
create_worker ("as-builder-1" , properties = {
181
- 'remote_test_host' : 'jetson6.lab.llvm.org' ,
182
- 'remote_test_user' : 'ubuntu'
181
+ 'remote_test_host' : 'jetson6.lab.llvm.org' ,
182
+ 'remote_test_user' : 'ubuntu' ,
183
+ 'clang_configs_path' : 'c:/buildbot/clang-configs' ,
184
+ 'zlib_root_path' : 'c:/buildbot/fs/zlib-win32' ,
183
185
},
184
186
max_builds = 1 ),
185
187
186
188
# Windows Server on Xeon Gold 6130 (2x2.1GHz), 128Gb of RAM
187
189
create_worker ("as-builder-2" , properties = {
188
190
'remote_test_host' : 'jetson-agx-2197.lab.llvm.org' ,
189
191
'remote_test_user' : 'ubuntu' ,
190
- 'sysroot_path_aarch64 ' : 'c:/buildbot/fs/jetson-agx-ubuntu ' ,
192
+ 'clang_configs_path ' : 'c:/buildbot/clang-configs ' ,
191
193
'zlib_root_path' : 'c:/buildbot/fs/zlib-win32' ,
192
194
},
193
195
max_builds = 1 ),
You can’t perform that action at this time.
0 commit comments