Skip to content

Commit bed0c3f

Browse files
committed
Adjust all runtime build configurations
1 parent 6e7d7fd commit bed0c3f

File tree

2 files changed

+6
-127
lines changed

2 files changed

+6
-127
lines changed

.ci/monolithic-linux.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,9 @@ if [[ "${runtimes}" != "" ]]; then
117117
cmake -S "${MONOREPO_ROOT}/runtimes" -B "${RUNTIMES_BUILD_DIR}" -GNinja \
118118
-D CMAKE_C_COMPILER="${INSTALL_DIR}/bin/clang" \
119119
-D CMAKE_CXX_COMPILER="${INSTALL_DIR}/bin/clang++" \
120+
-D CMAKE_Fortran_COMPILER="${BUILD_DIR}/bin/flang" \
121+
-D CMAKE_Fortran_COMPILER_WORKS=ON \
122+
-D LLVM_BINARY_DIR="${BUILD_DIR}" \
120123
-D LLVM_ENABLE_RUNTIMES="${runtimes}" \
121124
-D LIBCXX_CXX_ABI=libcxxabi \
122125
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -135,6 +138,9 @@ if [[ "${runtimes}" != "" ]]; then
135138
cmake -S "${MONOREPO_ROOT}/runtimes" -B "${RUNTIMES_BUILD_DIR}" -GNinja \
136139
-D CMAKE_C_COMPILER="${INSTALL_DIR}/bin/clang" \
137140
-D CMAKE_CXX_COMPILER="${INSTALL_DIR}/bin/clang++" \
141+
-D CMAKE_Fortran_COMPILER="${BUILD_DIR}/bin/flang" \
142+
-D CMAKE_Fortran_COMPILER_WORKS=ON \
143+
-D LLVM_BINARY_DIR="${BUILD_DIR}" \
138144
-D LLVM_ENABLE_RUNTIMES="${runtimes}" \
139145
-D LIBCXX_CXX_ABI=libcxxabi \
140146
-D CMAKE_BUILD_TYPE=RelWithDebInfo \

.ci/monolithic-local.sh

Lines changed: 0 additions & 127 deletions
This file was deleted.

0 commit comments

Comments
 (0)