Skip to content

Commit 12f932e

Browse files
authored
Merge pull request #26 from arrowd/e2k-numpy
Cherry-pick Elbrus2000-related fixes from upstream
2 parents 3ffac33 + 612617d commit 12f932e

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

mesonbuild/compilers/fortran.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,11 @@ def get_options(self) -> 'MutableKeyedOptionDictType':
343343
def get_module_outdir_args(self, path: str) -> T.List[str]:
344344
return ['-J' + path]
345345

346+
def language_stdlib_only_link_flags(self) -> T.List[str]:
347+
# No need to add search paths here, because LCC ships everything
348+
# (C, C++, Fortran) and always knows where to look for its stuff
349+
return ['-lgfortran', '-lm']
350+
346351

347352
class G95FortranCompiler(FortranCompiler):
348353

mesonbuild/compilers/mixins/elbrus.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,7 @@ def get_option_std_args(self, target: BuildTarget, subproject: T.Optional[str] =
9696

9797
def openmp_flags(self) -> T.List[str]:
9898
return ['-fopenmp']
99+
100+
@classmethod
101+
def use_linker_args(cls, linker: str, version: str) -> T.List[str]:
102+
return []

0 commit comments

Comments
 (0)