Skip to content

Commit ca344a2

Browse files
authored
Update configuration for armv7l/aarch64 Win-to-Linux cross toolchain builders. (#199)
* llvm-clang-win-x-{armv7l,aarch64}-release * llvm-clang-win-x-{armv7l,aarch64} Removed DEFAULT_SYSROOT from the build configurations. Use the local clang configuration files instead. More details could be found here: llvm/llvm-project#94284
1 parent 38f7c97 commit ca344a2

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

buildbot/osuosl/master/config/builders.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@
217217
extra_configure_args=[
218218
"-DLLVM_TARGETS_TO_BUILD=ARM",
219219
"-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"),
222222
"-DLLVM_LIT_ARGS=-v -vv --threads=32",
223223
WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"),
224224
WithProperties("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s"),
@@ -256,7 +256,7 @@
256256
extra_configure_args=[
257257
"-DLLVM_TARGETS_TO_BUILD=AArch64",
258258
"-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"),
260260
WithProperties("-DZLIB_ROOT=%(zlib_root_path)s"),
261261
"-DLLVM_LIT_ARGS=-v -vv --threads=32",
262262
WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"),

buildbot/osuosl/master/config/release_builders.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
extra_configure_args=[
132132
"-DLLVM_TARGETS_TO_BUILD=ARM",
133133
"-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"),
136136
"-DLLVM_LIT_ARGS=-v -vv --threads=32",
137137
WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"),
138138
WithProperties("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s"),
@@ -170,7 +170,7 @@
170170
extra_configure_args=[
171171
"-DLLVM_TARGETS_TO_BUILD=AArch64",
172172
"-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"),
174174
WithProperties("-DZLIB_ROOT=%(zlib_root_path)s"),
175175
"-DLLVM_LIT_ARGS=-v -vv --threads=32",
176176
WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"),

buildbot/osuosl/master/config/workers.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -178,16 +178,18 @@ def get_all():
178178

179179
# Windows Server on Xeon Gold 6130 (2x2.1GHz), 128Gb of RAM
180180
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',
183185
},
184186
max_builds=1),
185187

186188
# Windows Server on Xeon Gold 6130 (2x2.1GHz), 128Gb of RAM
187189
create_worker("as-builder-2", properties={
188190
'remote_test_host' : 'jetson-agx-2197.lab.llvm.org',
189191
'remote_test_user' : 'ubuntu',
190-
'sysroot_path_aarch64' : 'c:/buildbot/fs/jetson-agx-ubuntu',
192+
'clang_configs_path' : 'c:/buildbot/clang-configs',
191193
'zlib_root_path' : 'c:/buildbot/fs/zlib-win32',
192194
},
193195
max_builds=1),

0 commit comments

Comments
 (0)