[flang-commits] [flang] e78e1f5 - Revert "[flang] Put ISO_Fortran_binding.h where it can be easily used (#69121)"

[Peter Steinfeld via flang-commits]

Author: Peter Steinfeld
Date: 2023-10-20T09:04:09-07:00
New Revision: e78e1f519b7b7e9eac2a629535d99c5f47cae3d3

URL: https://github.com/llvm/llvm-project/commit/e78e1f519b7b7e9eac2a629535d99c5f47cae3d3
DIFF: https://github.com/llvm/llvm-project/commit/e78e1f519b7b7e9eac2a629535d99c5f47cae3d3.diff

LOG: Revert "[flang] Put ISO_Fortran_binding.h where it can be easily used (#69121)"

This reverts commit e6e90840708099425b7b69dd053634ff25d4907f.

This is to fix https://github.com/llvm/llvm-project/issues/69697.

Added: 
    

Modified: 
    flang/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt
index 74245374166ba9c..ac30da89995ed31 100644
--- a/flang/CMakeLists.txt
+++ b/flang/CMakeLists.txt
@@ -273,10 +273,10 @@ if (NOT(FLANG_DEFAULT_RTLIB STREQUAL ""))
       "Default runtime library to use (empty for platform default)" FORCE)
 endif()
 
+
+
 set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
-if (NOT PACKAGE_VERSION)
-  set(PACKAGE_VERSION ${LLVM_VERSION_MAJOR})
-endif()
+
 
 if (NOT DEFINED FLANG_VERSION_MAJOR)
   set(FLANG_VERSION_MAJOR ${LLVM_VERSION_MAJOR})
@@ -490,17 +490,3 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
     PATTERN "*.inc"
     )
 endif()
-
-# Put ISO_Fortran_binding.h into the include files of the build area now
-# so that we can run tests before installing
-include(GetClangResourceDir)
-get_clang_resource_dir(HEADER_BINARY_DIR PREFIX ${LLVM_LIBRARY_OUTPUT_INTDIR}/.. SUBDIR include)
-configure_file(
-  ${FLANG_SOURCE_DIR}/include/flang/ISO_Fortran_binding.h
-  ${HEADER_BINARY_DIR}/ISO_Fortran_binding.h)
-
-# And also install it into the install area
-get_clang_resource_dir(HEADER_INSTALL_DIR PREFIX ${CMAKE_INSTALL_PREFIX} SUBDIR include)
-install(
-  FILES ${CMAKE_INSTALL_PREFIX}/include/flang/ISO_Fortran_binding.h 
-  DESTINATION ${HEADER_INSTALL_DIR})