Skip to content

Commit e78e1f5

Browse files
committed
Revert "[flang] Put ISO_Fortran_binding.h where it can be easily used (#69121)"
This reverts commit e6e9084. This is to fix #69697.
1 parent f08fe1f commit e78e1f5

File tree

1 file changed

+3
-17
lines changed

1 file changed

+3
-17
lines changed

flang/CMakeLists.txt

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,10 @@ if (NOT(FLANG_DEFAULT_RTLIB STREQUAL ""))
273273
"Default runtime library to use (empty for platform default)" FORCE)
274274
endif()
275275

276+
277+
276278
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
277-
if (NOT PACKAGE_VERSION)
278-
set(PACKAGE_VERSION ${LLVM_VERSION_MAJOR})
279-
endif()
279+
280280

281281
if (NOT DEFINED FLANG_VERSION_MAJOR)
282282
set(FLANG_VERSION_MAJOR ${LLVM_VERSION_MAJOR})
@@ -490,17 +490,3 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
490490
PATTERN "*.inc"
491491
)
492492
endif()
493-
494-
# Put ISO_Fortran_binding.h into the include files of the build area now
495-
# so that we can run tests before installing
496-
include(GetClangResourceDir)
497-
get_clang_resource_dir(HEADER_BINARY_DIR PREFIX ${LLVM_LIBRARY_OUTPUT_INTDIR}/.. SUBDIR include)
498-
configure_file(
499-
${FLANG_SOURCE_DIR}/include/flang/ISO_Fortran_binding.h
500-
${HEADER_BINARY_DIR}/ISO_Fortran_binding.h)
501-
502-
# And also install it into the install area
503-
get_clang_resource_dir(HEADER_INSTALL_DIR PREFIX ${CMAKE_INSTALL_PREFIX} SUBDIR include)
504-
install(
505-
FILES ${CMAKE_INSTALL_PREFIX}/include/flang/ISO_Fortran_binding.h
506-
DESTINATION ${HEADER_INSTALL_DIR})

0 commit comments

Comments
 (0)