finclude -> finclude/flang

Meinersbur · Meinersbur · commit c53c94d54c6e · 2025-10-29T12:02:31.000+01:00
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
@@ -1019,7 +1019,7 @@ ToolChain::getTargetSubDirPath(StringRef BaseDir) const {
 
 std::optional<std::string> ToolChain::getDefaultIntrinsicModuleDir() const {
   SmallString<128> P(D.ResourceDir);
-  llvm::sys::path::append(P, "finclude");
+  llvm::sys::path::append(P, "finclude", "flang");
   return getTargetSubDirPath(P);
 }
 
diff --git a/cmake/Modules/GetToolchainDirs.cmake b/cmake/Modules/GetToolchainDirs.cmake
@@ -52,7 +52,7 @@ endfunction ()
 
 # Corresponds to Flang's ToolChain::getDefaultIntrinsicModuleDir().
 function (get_toolchain_module_subdir outvar)
-  set(outval "finclude")
+  set(outval "finclude/flang")
 
   get_toolchain_arch_dirname(arch_dirname)
   set(outval "${outval}/${arch_dirname}")

Original file line number	Diff line number	Diff line change
`@@ -1019,7 +1019,7 @@ ToolChain::getTargetSubDirPath(StringRef BaseDir) const {`
`1019`	`1019`
`1020`	`1020`	`std::optional<std::string> ToolChain::getDefaultIntrinsicModuleDir() const {`
`1021`	`1021`	`SmallString<128> P(D.ResourceDir);`
`1022`		`- llvm::sys::path::append(P, "finclude");`
	`1022`	`+ llvm::sys::path::append(P, "finclude", "flang");`
`1023`	`1023`	`return getTargetSubDirPath(P);`
`1024`	`1024`	`}`
`1025`	`1025`