Skip to content

rename self.exe attribute #149

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
MatthewHambley merged 8 commits into from
Oct 24, 2022
Merged

rename self.exe attribute #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
68a72b2
better attribute name for command line tool
bblay Oct 6, 2022
2bb35fe
Merge remote-tracking branch 'upstream/master' into rename_exe_attribute
bblay Oct 20, 2022
5a9ac18
i take it back, mypy, all is forgiven. caught an auto-merge conflict …
bblay Oct 20, 2022
d5be3e8
test fix
bblay Oct 20, 2022
92d0372
test fix
bblay Oct 20, 2022
5a8eaff
remove duplicate line
bblay Oct 20, 2022
f191672
Merge remote-tracking branch 'upstream/master' into rename_exe_attribute
bblay Oct 21, 2022
01c6c1d
Merge branch 'master' into rename_exe_attribute
MatthewHambley Oct 24, 2022
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 source/fab/steps/compile_c.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def __init__(self, compiler: str = None, common_flags: List[str] = None, path_fl
"""
super().__init__(name=name)

self.exe = compiler or os.getenv('CC', 'gcc -c')
self.compiler = compiler or os.getenv('CC', 'gcc -c')
self.flags = FlagsConfig(common_flags=common_flags, path_flags=path_flags)
self.source_getter = source or DEFAULT_SOURCE_GETTER

Expand Down Expand Up @@ -105,7 +105,7 @@ def _compile_file(self, analysed_file: AnalysedFile):
with Timer() as timer:
output_fpath.parent.mkdir(parents=True, exist_ok=True)

command = self.exe.split() # type: ignore
command = self.compiler.split() # type: ignore
command.extend(self.flags.flags_for_path(path=analysed_file.fpath, config=self._config))
command.append(str(analysed_file.fpath))
command.extend(['-o', str(output_fpath)])
Expand Down
1 change: 0 additions & 1 deletion source/fab/steps/compile_fortran.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,6 @@ def _get_obj_combo_hash(self, analysed_file, flags):
])
except TypeError:
raise ValueError("could not generate combo hash for object file")

return obj_combo_hash

def _get_mod_combo_hash(self, analysed_file):
Expand Down