diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-30 22:42:11 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-30 22:42:11 +0300 |
| commit | 8e734a8c9fbd874a20c59a3994df0bf081f3bf48 (patch) | |
| tree | 726140a8c937ddc857b90f44a466fac5e6fdc9a0 | |
| parent | 37c5d45d0715bda5ff163ff7c36fbdace009ee47 (diff) | |
| download | meson-8e734a8c9fbd874a20c59a3994df0bf081f3bf48.zip meson-8e734a8c9fbd874a20c59a3994df0bf081f3bf48.tar.gz meson-8e734a8c9fbd874a20c59a3994df0bf081f3bf48.tar.bz2 | |
Set Gnu fortran type based on platform.
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 1 | ||||
| -rw-r--r-- | mesonbuild/environment.py | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 909705f..ce8d46e 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -525,7 +525,6 @@ int dummy; srcabs = os.path.join(self.environment.get_source_dir(), m.get_source_subdir(), f) dstabs = os.path.join(subdir, os.path.split(f)[1] + '.gz') i = [srcabs, dstabs] - print(i) d.man.append(i) def generate_data_install(self, d): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 5096320..fcd4bdb 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -309,7 +309,13 @@ class Environment(): version = vmatch.group(0) if 'GNU Fortran' in out: - return GnuFortranCompiler([compiler], version, GCC_STANDARD, is_cross, exe_wrap) + if mesonlib.is_osx(): + gcctype = GCC_OSX + elif mesonlib.is_windows(): + gcctype = GCC_MINGW + else: + gcctype = GCC_STANDARD + return GnuFortranCompiler([compiler], version, gcctype, is_cross, exe_wrap) if 'G95' in out: return G95FortranCompiler([compiler], version, is_cross, exe_wrap) |