This is an archive of the discontinued LLVM Phabricator instance.

Differential D121031

[Buildbot] Use 'TOOLCHAIN_TARGET_TRIPLE' instead of `TARGET_TRIPLE` for Win to Linux Arm cross builders.
ClosedPublic

Authored by vvereschaka on Mar 4 2022, 4:16 PM.

Details

Reviewers
gkistanova
vvereschaka
Commits
rZORG02ae083a8a7c: [Buildbot] Use 'TOOLCHAIN_TARGET_TRIPLE' instead of `TARGET_TRIPLE` for Win to…
Summary

Reference: https://reviews.llvm.org/D121029

Diff Detail

Event Timeline

vvereschaka created this revision.Mar 4 2022, 4:16 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 4 2022, 4:16 PM
Herald added a subscriber: kristof.beyls. · View Herald Transcript
vvereschaka requested review of this revision.Mar 4 2022, 4:16 PM
gkistanova accepted this revision.Mar 4 2022, 5:05 PM

LGTM.

This revision is now accepted and ready to land.Mar 4 2022, 5:05 PM
Closed by commit rZORG02ae083a8a7c: [Buildbot] Use 'TOOLCHAIN_TARGET_TRIPLE' instead of `TARGET_TRIPLE` for Win to… (authored by vvereschaka). · Explain WhyMar 4 2022, 5:28 PM
This revision was automatically updated to reflect the committed changes.
vvereschaka added a commit: rZORG02ae083a8a7c: [Buildbot] Use 'TOOLCHAIN_TARGET_TRIPLE' instead of `TARGET_TRIPLE` for Win to….

Revision Contents

PathSize
buildbot/
osuosl/
master/
config/
4 lines
4 lines

Diff 413177

buildbot/osuosl/master/config/builders.py

Show First 20 Lines • Show All 175 Lines • ▼ Show 20 Lines 'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
("libc++", ("libc++",
['python', 'bin/llvm-lit.py', ['python', 'bin/llvm-lit.py',
'-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", "-DTOOLCHAIN_TARGET_TRIPLE=armv7-unknown-linux-gnueabihf",
"-DDEFAULT_SYSROOT=C:/buildbot/.arm-ubuntu", "-DDEFAULT_SYSROOT=C:/buildbot/.arm-ubuntu",
"-DZLIB_ROOT=C:/buildbot/.zlib-win32", "-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")},
Show All 22 Lines 'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
("libc++", ("libc++",
['python', 'bin/llvm-lit.py', ['python', 'bin/llvm-lit.py',
'-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", "-DTOOLCHAIN_TARGET_TRIPLE=aarch64-unknown-linux-gnu",
"-DDEFAULT_SYSROOT=C:/buildbot/.aarch64-ubuntu", "-DDEFAULT_SYSROOT=C:/buildbot/.aarch64-ubuntu",
"-DZLIB_ROOT=C:/buildbot/.zlib-win32", "-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")},
▲ Show 20 Lines • Show All 2,087 Lines • Show Last 20 Lines

buildbot/osuosl/master/config/release_builders.py

Show First 20 Lines • Show All 120 Lines • ▼ Show 20 Lines 'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
("libc++", ("libc++",
['python', 'bin/llvm-lit.py', ['python', 'bin/llvm-lit.py',
'-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", "-DTOOLCHAIN_TARGET_TRIPLE=armv7-unknown-linux-gnueabihf",
"-DDEFAULT_SYSROOT=C:/buildbot/.arm-ubuntu", "-DDEFAULT_SYSROOT=C:/buildbot/.arm-ubuntu",
"-DZLIB_ROOT=C:/buildbot/.zlib-win32", "-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")},
Show All 22 Lines 'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
("libc++", ("libc++",
['python', 'bin/llvm-lit.py', ['python', 'bin/llvm-lit.py',
'-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", "-DTOOLCHAIN_TARGET_TRIPLE=aarch64-unknown-linux-gnu",
"-DDEFAULT_SYSROOT=C:/buildbot/.aarch64-ubuntu", "-DDEFAULT_SYSROOT=C:/buildbot/.aarch64-ubuntu",
"-DZLIB_ROOT=C:/buildbot/.zlib-win32", "-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")},
▲ Show 20 Lines • Show All 53 Lines • Show Last 20 Lines