diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-01-28 09:58:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-28 09:58:08 -0800 |
| commit | 3d60665885132cceccc7d80640a5b4735d6a7d48 (patch) | |
| tree | e284a49e9c2b66c31d8dffede7db4703f2aafb4a /run_unittests.py | |
| parent | 0fe485a100ee556bf1d600e6bb87640641b67a76 (diff) | |
| parent | ee6c2c87fc238e673c609ad7200bd0aa66af03b4 (diff) | |
| download | meson-3d60665885132cceccc7d80640a5b4735d6a7d48.zip meson-3d60665885132cceccc7d80640a5b4735d6a7d48.tar.gz meson-3d60665885132cceccc7d80640a5b4735d6a7d48.tar.bz2 | |
Merge pull request #6455 from makise-homura/elbrus_0.53.0
Elbrus support is broken in 0.53.0, so fixing it
Diffstat (limited to 'run_unittests.py')
| -rwxr-xr-x | run_unittests.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/run_unittests.py b/run_unittests.py index ae12f4e..ff9dbd6 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -2290,7 +2290,7 @@ class AllPlatformTests(BasePlatformTests): ar = mesonbuild.linkers.ArLinker lib = mesonbuild.linkers.VisualStudioLinker langs = [('c', 'CC'), ('cpp', 'CXX')] - if not is_windows(): + if not is_windows() and platform.machine().lower() != 'e2k': langs += [('objc', 'OBJC'), ('objcpp', 'OBJCXX')] testdir = os.path.join(self.unit_test_dir, '5 compiler detection') env = get_fake_env(testdir, self.builddir, self.prefix) @@ -3087,7 +3087,9 @@ int main(int argc, char **argv) { pass try: env.detect_fortran_compiler(MachineChoice.HOST) - langs.append('fortran') + if is_windows() or platform.machine().lower() != 'e2k': + # Elbrus Fortran compiler can't generate debug information + langs.append('fortran') except EnvironmentException: pass try: |