Skip to content

make sure AOCC commands like clang/flang pick up GCCcore as GCC toolchain #2538

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
Sep 2, 2021
Merged

make sure AOCC commands like clang/flang pick up GCCcore as GCC toolchain #2538

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25a5822
AOCC easyblock: make sure clang/flang picks up GCCcore as GCC toolchain
SebastianAchilles Aug 7, 2021
86aa43b
AOCC easyblock: use wrapper to make sure clang/flang picks up GCCcore…
SebastianAchilles Aug 30, 2021
235484c
AOCC easyblock: use wrapper to make sure clang/flang picks up GCCcore…
SebastianAchilles Aug 30, 2021
8b3cbfe
style fixes for AOCC easyblock
boegel Sep 2, 2021
fa9aa20
Merge pull request #1 from boegel/20210808003404_new_pr_RISXIyGGFH
Sep 2, 2021
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: 4 additions & 0 deletions easybuild/easyblocks/a/aocc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def _aocc_guess_clang_version(self):
map_aocc_to_clang_ver = {
'2.3.0': '11.0.0',
'3.0.0': '12.0.0',
'3.1.0': '12.0.0',
}

if self.version in map_aocc_to_clang_ver:
Expand Down Expand Up @@ -116,6 +117,9 @@ def make_module_extra(self):
txt += self.module_generator.set_environment('ASAN_SYMBOLIZER_PATH', asan_symbolizer_path)
# setting the AOCChome path
txt += self.module_generator.set_environment('AOCChome', self.installdir)
# make sure clang/flang picks up GCCcore as GCC toolchain
txt += self.module_generator.set_alias('clang', 'clang --gcc-toolchain=$EBROOTGCCCORE')
txt += self.module_generator.set_alias('flang', 'flang --gcc-toolchain=$EBROOTGCCCORE')
Copy link
Member

Choose a reason for hiding this comment

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

@SebastianAchilles Maybe we should install an actual wrapper script rather than just defining an alias, since an alias is not inherited into a subshell?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, a wrapper script sounds like a good idea. I implemented the wrapper in 86aa43b and 235484c

return txt

def make_module_req_guess(self):
Expand Down