Skip to content

Commit bd152c5

Browse files
committed
[Flang] Remove FLANG_INCLUDE_RUNTIME
1 parent 3818238 commit bd152c5

File tree

11 files changed

+5
-780
lines changed

11 files changed

+5
-780
lines changed

flang/CMakeLists.txt

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ if (LLVM_ENABLE_EH)
2323
endif()
2424

2525
set(FLANG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
26-
set(FLANG_RT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../flang-rt")
2726

2827
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE)
2928
message(FATAL_ERROR "In-source builds are not allowed. \
@@ -237,24 +236,8 @@ else()
237236
include_directories(SYSTEM ${MLIR_TABLEGEN_OUTPUT_DIR})
238237
endif()
239238

240-
set(FLANG_INCLUDE_RUNTIME_default ON)
241-
if ("flang-rt" IN_LIST LLVM_ENABLE_RUNTIMES)
242-
set(FLANG_INCLUDE_RUNTIME_default OFF)
243-
endif ()
244-
option(FLANG_INCLUDE_RUNTIME "Build the runtime in-tree (deprecated; to be replaced with LLVM_ENABLE_RUNTIMES=flang-rt)" FLANG_INCLUDE_RUNTIME_default)
245-
if (FLANG_INCLUDE_RUNTIME)
246-
if ("flang-rt" IN_LIST LLVM_ENABLE_RUNTIMES)
247-
message(WARNING "Building Flang-RT using LLVM_ENABLE_RUNTIMES. FLANG_INCLUDE_RUNTIME=${FLANG_INCLUDE_RUNTIME} ignored.")
248-
set(FLANG_INCLUDE_RUNTIME OFF)
249-
else ()
250-
message(STATUS "Building flang_rt in-tree")
251-
endif ()
252-
else ()
253-
if ("flang-rt" IN_LIST LLVM_ENABLE_RUNTIMES)
254-
message(STATUS "Building Flang-RT using LLVM_ENABLE_RUNTIMES.")
255-
else ()
256-
message(STATUS "Not building Flang-RT. For a usable Fortran toolchain, compile a standalone Flang-RT")
257-
endif ()
239+
if (NOT "flang-rt" IN_LIST LLVM_ENABLE_RUNTIMES)
240+
message(STATUS "Not building Flang-RT. For a usable Fortran toolchain, compile a standalone Flang-RT")
258241
endif ()
259242

260243
set(FLANG_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
@@ -484,10 +467,6 @@ if (FLANG_CUF_RUNTIME)
484467
find_package(CUDAToolkit REQUIRED)
485468
endif()
486469

487-
if (FLANG_INCLUDE_RUNTIME)
488-
add_subdirectory(runtime)
489-
endif ()
490-
491470
if (LLVM_INCLUDE_EXAMPLES)
492471
add_subdirectory(examples)
493472
endif()

flang/cmake/modules/AddFlangOffloadRuntime.cmake

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

0 commit comments

Comments
 (0)