This is an archive of the discontinued LLVM Phabricator instance.

Differential D120957

[Buildbot] Enable zlib support for Windows to Linux cross toolchain builders.
ClosedPublic

Authored by vvereschaka on Mar 3 2022, 6:29 PM.

Details

Reviewers
gkistanova
vvereschaka
Commits
rZORGd5e29257a75a: [Buildbot] Enable zlib support for Windows to Linux cross toolchain builders.
Summary

Enable ZLIB_ROOT argument to provide a path the zlib library on Windows builders.

Diff Detail

Event Timeline

vvereschaka created this revision.Mar 3 2022, 6:29 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 3 2022, 6:29 PM
vvereschaka requested review of this revision.Mar 3 2022, 6:29 PM
gkistanova accepted this revision.Mar 3 2022, 6:30 PM

LGTM.

This revision is now accepted and ready to land.Mar 3 2022, 6:30 PM
Closed by commit rZORGd5e29257a75a: [Buildbot] Enable zlib support for Windows to Linux cross toolchain builders. (authored by vvereschaka). · Explain WhyMar 3 2022, 6:35 PM
This revision was automatically updated to reflect the committed changes.
vvereschaka added a commit: rZORGd5e29257a75a: [Buildbot] Enable zlib support for Windows to Linux cross toolchain builders..

Revision Contents

PathSize
buildbot/
osuosl/
master/
config/
2 lines
2 lines

Diff 412898

buildbot/osuosl/master/config/builders.py

Show First 20 Lines • Show All 177 Lines • ▼ Show 20 Lines 'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
'-v', '-vv', '--threads=32', '-v', '-vv', '--threads=32',
'runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxx/test', 'runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxx/test',
]) ])
], ],
extra_configure_args=[ extra_configure_args=[
"-DLLVM_TARGETS_TO_BUILD=ARM", "-DLLVM_TARGETS_TO_BUILD=ARM",
"-DTARGET_TRIPLE=armv7-unknown-linux-gnueabihf", "-DTARGET_TRIPLE=armv7-unknown-linux-gnueabihf",
"-DDEFAULT_SYSROOT=C:/buildbot/.arm-ubuntu", "-DDEFAULT_SYSROOT=C:/buildbot/.arm-ubuntu",
"-DZLIB_ROOT=C:/buildbot/.zlib-win32",
"-DLLVM_LIT_ARGS=-v -vv --threads=32", "-DLLVM_LIT_ARGS=-v -vv --threads=32",
WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"), WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"),
WithProperties("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s"), WithProperties("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s"),
], ],
cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")}, cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")},
{'name' : "llvm-clang-win-x-aarch64", {'name' : "llvm-clang-win-x-aarch64",
'tags' : ["clang", "llvm", "compiler-rt", "cross", "aarch64"], 'tags' : ["clang", "llvm", "compiler-rt", "cross", "aarch64"],
Show All 22 Lines 'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
'-v', '-vv', '--threads=32', '-v', '-vv', '--threads=32',
'runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxx/test', 'runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxx/test',
]) ])
], ],
extra_configure_args=[ extra_configure_args=[
"-DLLVM_TARGETS_TO_BUILD=AArch64", "-DLLVM_TARGETS_TO_BUILD=AArch64",
"-DTARGET_TRIPLE=aarch64-unknown-linux-gnu", "-DTARGET_TRIPLE=aarch64-unknown-linux-gnu",
"-DDEFAULT_SYSROOT=C:/buildbot/.aarch64-ubuntu", "-DDEFAULT_SYSROOT=C:/buildbot/.aarch64-ubuntu",
"-DZLIB_ROOT=C:/buildbot/.zlib-win32",
"-DLLVM_LIT_ARGS=-v -vv --threads=32", "-DLLVM_LIT_ARGS=-v -vv --threads=32",
WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"), WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"),
WithProperties("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s"), WithProperties("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s"),
], ],
cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")}, cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")},
# Clang builders. # Clang builders.
▲ Show 20 Lines • Show All 2,085 Lines • Show Last 20 Lines

buildbot/osuosl/master/config/release_builders.py

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines 'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
'-v', '-vv', '--threads=32', '-v', '-vv', '--threads=32',
'runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxx/test', 'runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxx/test',
]) ])
], ],
extra_configure_args=[ extra_configure_args=[
"-DLLVM_TARGETS_TO_BUILD=ARM", "-DLLVM_TARGETS_TO_BUILD=ARM",
"-DTARGET_TRIPLE=armv7-unknown-linux-gnueabihf", "-DTARGET_TRIPLE=armv7-unknown-linux-gnueabihf",
"-DDEFAULT_SYSROOT=C:/buildbot/.arm-ubuntu", "-DDEFAULT_SYSROOT=C:/buildbot/.arm-ubuntu",
"-DZLIB_ROOT=C:/buildbot/.zlib-win32",
"-DLLVM_LIT_ARGS=-v -vv --threads=32", "-DLLVM_LIT_ARGS=-v -vv --threads=32",
WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"), WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"),
WithProperties("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s"), WithProperties("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s"),
], ],
cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")}, cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")},
{'name' : "llvm-clang-win-x-aarch64-release", {'name' : "llvm-clang-win-x-aarch64-release",
'tags' : ["clang", "llvm", "compiler-rt", "cross", "aarch64", "release"], 'tags' : ["clang", "llvm", "compiler-rt", "cross", "aarch64", "release"],
Show All 22 Lines 'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
'-v', '-vv', '--threads=32', '-v', '-vv', '--threads=32',
'runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxx/test', 'runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxx/test',
]) ])
], ],
extra_configure_args=[ extra_configure_args=[
"-DLLVM_TARGETS_TO_BUILD=AArch64", "-DLLVM_TARGETS_TO_BUILD=AArch64",
"-DTARGET_TRIPLE=aarch64-unknown-linux-gnu", "-DTARGET_TRIPLE=aarch64-unknown-linux-gnu",
"-DDEFAULT_SYSROOT=C:/buildbot/.aarch64-ubuntu", "-DDEFAULT_SYSROOT=C:/buildbot/.aarch64-ubuntu",
"-DZLIB_ROOT=C:/buildbot/.zlib-win32",
"-DLLVM_LIT_ARGS=-v -vv --threads=32", "-DLLVM_LIT_ARGS=-v -vv --threads=32",
WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"), WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"),
WithProperties("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s"), WithProperties("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s"),
], ],
cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")}, cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")},
# LLD builders. # LLD builders.
▲ Show 20 Lines • Show All 51 Lines • Show Last 20 Lines