build fix

Author: Meinersbur

flang-rt/lib/runtime/CMakeLists.txt

@@ -306,7 +306,7 @@ set(Fortran_BUILDING_INSTRINSIC_MODULES TRUE)
 
 
 #add_compile_options($<$<COMPILE_LANGUAGE:Fortran>:SHELL:-module-dir> $<$<COMPILE_LANGUAGE:Fortran>:"${FLANG_RT_OUTPUT_RESOURCE_MOD_DIR}">)
-add_compile_options($<$<COMPILE_LANGUAGE:Fortran>:SHELL:"-fintrinsic-modules-path"> $<$<COMPILE_LANGUAGE:Fortran>:"${FLANG_RT_OUTPUT_RESOURCE_MOD_DIR}">)
+add_compile_options($<$<COMPILE_LANGUAGE:Fortran>:SHELL:"-fintrinsic-modules-path"> $<$<COMPILE_LANGUAGE:Fortran>:${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}>)
 
 # Phony target for intrinsics
 #add_custom_target(flangrt-mod)

runtimes/CMakeLists.txt

@@ -343,6 +343,7 @@ macro(flang_module_fortran_enable)
       get_clang_resource_dir(RUNTIMES_INSTALL_RESOURCE_PATH_DEFAULT)
 
       extend_path(RUNTIMES_OUTPUT_RESOURCE_MOD_DIR "${RUNTIMES_OUTPUT_RESOURCE_DIR}" "${toolchain_mod_subdir}")
+      extend_path(RUNTIMES_INSTALL_RESOURCE_MOD_PATH "${RUNTIMES_INSTALL_RESOURCE_PATH}" "${toolchain_mod_subdir}")
     else ()
       # In a standalone runtimes build, do not write into LLVM_BINARY_DIR. It may be
       # read-only and/or shared by multiple runtimes with different build
@@ -355,8 +356,8 @@ macro(flang_module_fortran_enable)
       set(RUNTIMES_INSTALL_RESOURCE_PATH_DEFAULT "lib${LLVM_LIBDIR_SUFFIX}/clang/${LLVM_VERSION_MAJOR}")
 
       extend_path(RUNTIMES_OUTPUT_RESOURCE_MOD_DIR "${RUNTIMES_OUTPUT_RESOURCE_DIR}" "finclude")
+      extend_path(RUNTIMES_INSTALL_RESOURCE_MOD_PATH "${RUNTIMES_INSTALL_RESOURCE_PATH}" "finclude")
     endif ()
-    extend_path(RUNTIMES_INSTALL_RESOURCE_MOD_PATH "${RUNTIMES_INSTALL_RESOURCE_PATH}" "${toolchain_mod_subdir}")
   else ()
     if (LLVM_TREE_AVAILABLE)
       set(RUNTIMES_OUTPUT_RESOURCE_MOD_DIR "${LLVM_LIBRARY_OUTPUT_INTDIR}/../finclude-${CMAKE_Fortran_COMPILER_ID}")