Skip to content

[flang/flang-rt] Add -isysroot flag only to tests really requiring #152914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 13, 2025
Merged

[flang/flang-rt] Add -isysroot flag only to tests really requiring #152914

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
156b6b0
[flang/flang-rt] Add -isysroot flag only to tests really requiring
parabola94 Aug 9, 2025
2449ff8
Call `use_clang` at the top-level
parabola94 Aug 11, 2025
0cef883
Use `flang_intrinsic_modules_dir` instead of `flang_source_dir` for t…
parabola94 Aug 11, 2025
131e0fd
Use `HEADER_BINARY_DIR` instead of `FLANG_INTRINSIC_MODULES_DIR`
parabola94 Aug 12, 2025
465aa39
Merge branch 'main' into flang-isysroot-test
parabola94 Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flang/test/Integration/iso-fortran-binding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down
6 changes: 2 additions & 4 deletions flang/test/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 0 additions & 1 deletion flang/test/lit.site.cfg.py.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@"
Expand Down