Skip to content

avoid suggesting that toolchainopts are supported for SYSTEM compiler, since they're not #4585

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
boegel merged 7 commits into from
Aug 27, 2024
Merged

avoid suggesting that toolchainopts are supported for SYSTEM compiler, since they're not #4585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0da94f6
`toolchainopts` are not supported for `SYSTEM` compiler
ocaisa Jul 23, 2024
c27e92b
Option mappings also need to be reset
ocaisa Jul 23, 2024
16ce1ed
Move the changes to the parent class
ocaisa Jul 24, 2024
72f4106
Use a test easyconfig where toolchainopts are allowed
ocaisa Jul 30, 2024
0444bd2
Don't use SYSTEM toolchain for toolchain tests
ocaisa Jul 30, 2024
27a869b
Make unrelated warning from CI disappear
Jul 24, 2024
8737a38
Merge branch '5.0.x' into system_tcopts
boegel Aug 27, 2024
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
7 changes: 7 additions & 0 deletions easybuild/toolchains/compiler/systemcompiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,10 @@ class SystemCompiler(Compiler):
"""System compiler"""
COMPILER_MODULE_NAME = []
COMPILER_FAMILY = TC_CONSTANT_SYSTEM

# The system compiler does not currently support even the shared options
# (changing this would require updating set_minimal_build_env() of the toolchain class)
COMPILER_UNIQUE_OPTS = None
COMPILER_SHARED_OPTS = None
COMPILER_UNIQUE_OPTION_MAP = None
COMPILER_SHARED_OPTION_MAP = None
2 changes: 1 addition & 1 deletion test/framework/toolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def get_toolchain(self, name, version=None):
def test_toolchain(self):
"""Test whether toolchain is initialized correctly."""
test_ecs = os.path.join('test', 'framework', 'easyconfigs', 'test_ecs')
ec_file = find_full_path(os.path.join(test_ecs, 'g', 'gzip', 'gzip-1.4.eb'))
ec_file = find_full_path(os.path.join(test_ecs, 'g', 'gzip', 'gzip-1.4-GCC-4.9.3-2.26.eb'))
ec = EasyConfig(ec_file, validate=False)
tc = ec.toolchain
self.assertIn('debug', tc.options)
Expand Down
4 changes: 2 additions & 2 deletions test/framework/toy_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2820,8 +2820,8 @@ def grab_gcc_rpath_wrapper_args():

# test use of rpath toolchain option
test_ecs = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'easyconfigs', 'test_ecs')
toy_ec_txt = read_file(os.path.join(test_ecs, 't', 'toy', 'toy-0.0.eb'))
toy_ec_txt += "\ntoolchainopts = {'rpath': False}\n"
toy_ec_txt = read_file(os.path.join(test_ecs, 't', 'toy', 'toy-0.0-gompi-2018a.eb'))
toy_ec_txt += "\ntoolchainopts = {'rpath': False}\n" # overwrites existing toolchainopts
toy_ec = os.path.join(self.test_prefix, 'toy.eb')
write_file(toy_ec, toy_ec_txt)
with self.mocked_stdout_stderr():
Expand Down