Skip to content

Commit 4d57130

Browse files
authored
[Flang] Revert/Fix some bot changes. (#275)
For the time being, change the Flang bot config to something without libcxx, libunwind, compiler-rt. This is an attempt to bring the bot back to green and guarantee some coverage. The issues that showed up: - Enabling libunwind as default unwind library leads to file-not-found-errors in the OpenMP tests. - [edit] Adding libunwind also makes Offload believe the system is 32 bit and not build the offload library [/edit] - Enabling compiler-rt and not libunwind leads to a failing build of some parts of archer. - Removing libunwind and compiler-rt while enabling libcxx/libcxx-abi does lead to a CMake error that it wants to use libunwind, but that is not specified.
1 parent 472e6bf commit 4d57130

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

buildbot/osuosl/master/config/builders.py

+7-14
Original file line numberDiff line numberDiff line change
@@ -1940,8 +1940,8 @@
19401940
'builddir': "openmp-offload-amdgpu-clang-flang",
19411941
'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
19421942
clean=True,
1943-
enable_runtimes=['compiler-rt', 'libunwind', 'libcxx', 'libcxxabi', 'openmp', 'offload'],
1944-
depends_on_projects=['llvm','clang','lld', 'offload', 'openmp','flang', 'compiler-rt', 'libcxx', 'libcxxabi', 'libunwind'],
1943+
enable_runtimes=['compiler-rt', 'openmp', 'offload'],
1944+
depends_on_projects=['llvm','clang','lld', 'offload', 'openmp','flang', 'compiler-rt'],
19451945
extraCmakeArgs=[
19461946
"-DCMAKE_BUILD_TYPE=Release",
19471947
"-DCLANG_DEFAULT_LINKER=lld",
@@ -1950,22 +1950,15 @@
19501950
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
19511951
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
19521952
"-DFLANG_RUNTIME_F128_MATH_LIB=libquadmath",
1953-
"-DLIBCXX_ENABLE_SHARED=OFF",
1954-
"-DLIBCXX_ENABLE_STATIC=ON",
1955-
"-DLIBCXX_INSTALL_LIBRARY=OFF",
1956-
"-DLIBCXX_INSTALL_HEADERS=OFF",
1957-
"-DLIBCXXABI_ENABLE_SHARED=OFF",
1958-
"-DLIBCXXABI_ENABLE_STATIC=ON",
1959-
"-DLIBCXXABI_INSTALL_STATIC_LIBRARY=OFF",
1960-
"-DLLVM_ENABLE_ZLIB=ON",
1961-
"-DLLVM_ENABLE_Z3_SOLVER=OFF",
19621953
"-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON",
19631954
"-DCMAKE_CXX_STANDARD=17",
19641955
"-DBUILD_SHARED_LIBS=ON",
1965-
"-DLLVM_ENABLE_LIBCXX=ON",
1966-
"-DCLANG_DEFAULT_RTLIB=compiler-rt",
1967-
"-DCLANG_DEFAULT_UNWINDLIB=libunwind",
19681956
"-DLIBOMPTARGET_PLUGINS_TO_BUILD=amdgpu;host",
1957+
"-DCOMPILER_RT_BUILD_ORC=OFF",
1958+
"-DCOMPILER_RT_BUILD_XRAY=OFF",
1959+
"-DCOMPILER_RT_BUILD_MEMPROF=OFF",
1960+
"-DCOMPILER_RT_BUILD_LIBFUZZER=OFF",
1961+
"-DCOMPILER_RT_BUILD_SANITIZERS=ON",
19691962
],
19701963
env={
19711964
'HSA_ENABLE_SDMA':'0',

0 commit comments

Comments
 (0)