Use flang_intrinsic_modules_dir instead of flang_source_dir for the include path

Author: parabola94

flang/test/Integration/iso-fortran-binding.cpp

@@ -1,7 +1,7 @@
 // REQUIRES: clang
 // UNSUPPORTED: system-windows
 // RUN: rm -rf %t && mkdir %t
-// RUN: %clangxx %isysroot -I %include/flang %s -o %t/a.out
+// RUN: %clangxx %isysroot -I%flang_include %s -o %t/a.out
 // RUN: %t/a.out | FileCheck %s
 
 extern "C" {

flang/test/lit.cfg.py

@@ -174,10 +174,8 @@
 
 llvm_config.use_clang(required=False)
 
-# Include path for C headers that define Flang's Fortran ABI.
-config.substitutions.append(
-    ("%include", os.path.join(config.flang_source_dir, "include"))
-)
+# Clang may need the include path for ISO_fortran_binding.h.
+config.substitutions.append(("%flang_include", config.flang_intrinsic_modules_dir))
 
 # Enable libpgmath testing
 result = lit_config.params.get("LIBPGMATH")

flang/test/lit.site.cfg.py.in

@@ -11,7 +11,6 @@ config.target_triple = "@LLVM_TARGET_TRIPLE@"
 config.llvm_target_triple_env = "@LLVM_TARGET_TRIPLE_ENV@"
 config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 config.errc_messages = "@LLVM_LIT_ERRC_MESSAGES@"
-config.flang_source_dir = "@FLANG_SOURCE_DIR@"
 config.flang_obj_root = "@FLANG_BINARY_DIR@"
 config.flang_tools_dir = lit_config.substitute("@FLANG_TOOLS_DIR@")
 config.flang_intrinsic_modules_dir = "@FLANG_INTRINSIC_MODULES_DIR@"