diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-08-27 14:50:10 -0700 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-08-30 00:01:32 +0300 |
| commit | 0efab591da210418e0d618449be2f9462d5d58e8 (patch) | |
| tree | b2fb1641b336c8262b1ec2e4da5d6cec12046241 /mesonbuild/compilers/fortran.py | |
| parent | 3256e7ea63edb8508d1a2aac45da02e5c452df2c (diff) | |
| download | meson-0efab591da210418e0d618449be2f9462d5d58e8.tar.gz | |
compilers: Move the compiler argument to proxy linker flags to the compiler class
Instead of the DynamicLinker returning a hardcoded value like
`-Wl,-foo`, it now is passed a value that could be '-Wl,', or could be
something '-Xlinker='
This makes a few things cleaner, and will make it possible to fix using
clang (not clang-cl) on windows, where it invokes either link.exe or
lld-link.exe instead of a gnu-ld compatible linker.
Diffstat (limited to 'mesonbuild/compilers/fortran.py')
| -rw-r--r-- | mesonbuild/compilers/fortran.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py index 30ec6fea2..fd7b91a21 100644 --- a/mesonbuild/compilers/fortran.py +++ b/mesonbuild/compilers/fortran.py @@ -185,6 +185,9 @@ class ElbrusFortranCompiler(GnuFortranCompiler, ElbrusCompiler): ElbrusCompiler.__init__(self, compiler_type, defines) class G95FortranCompiler(FortranCompiler): + + LINKER_PREFIX = '-Wl,' + def __init__(self, exelist, version, for_machine: MachineChoice, is_cross, exe_wrapper=None, **kwags): FortranCompiler.__init__(self, exelist, version, for_machine, is_cross, exe_wrapper, **kwags) self.id = 'g95' @@ -203,6 +206,9 @@ class G95FortranCompiler(FortranCompiler): class SunFortranCompiler(FortranCompiler): + + LINKER_PREFIX = '-Wl,' + def __init__(self, exelist, version, for_machine: MachineChoice, is_cross, exe_wrapper=None, **kwags): FortranCompiler.__init__(self, exelist, version, for_machine, is_cross, exe_wrapper, **kwags) self.id = 'sun' |
