Skip to content

[NFC] Makefile.defs: Improve omptest search path building #2233

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
mhalk merged 2 commits into from
May 29, 2026
Merged

[NFC] Makefile.defs: Improve omptest search path building #2233

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
689279a
[NFC] Makefile.defs: Improve omptest search path building
mhalk May 27, 2026
a43184a
fixup! [NFC] Makefile.defs: Improve omptest search path building
mhalk May 27, 2026
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
4 changes: 2 additions & 2 deletions test/Makefile.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,8 @@ else
endif

# ompTest: Set header include path + linker flag for corresponding OMPT tests
CLANG_VERSION := $(lastword $(sort $(notdir $(patsubst %/,%,$(dir $(wildcard $(AOMP)/lib/clang/*/))))))
OMPTEST = -I$(AOMP)/lib/clang/$(CLANG_VERSION)/include/omptest -lomptest
CLANG_RESOURCE_DIR := $(shell $(AOMP)/bin/clang -print-resource-dir)
Copy link
Copy Markdown
Contributor

@Kewen12 Kewen12 May 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to check if clang exists here?

Copy link
Copy Markdown
Contributor Author

@mhalk mhalk May 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point!
AFAICT that check is done here: Makefile.defs#L44-L69
And we e.g. rely on the presence of clang here: Makefile.defs#L71

OMPTEST = -I$(CLANG_RESOURCE_DIR)/include/omptest -lomptest

# ompTest: Set and export CMake config path
omptest_DIR = $(AOMP)/lib/cmake/openmp/omptest/
Expand Down