From 7ca53e40a378ec633f6513113dbe2193dca62d19 Mon Sep 17 00:00:00 2001 From: makise-homura Date: Mon, 13 Jan 2020 17:20:07 +0300 Subject: ObjC/ObjC++ compilers are not available for Elbrus, so don't fail --- run_unittests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'run_unittests.py') diff --git a/run_unittests.py b/run_unittests.py index ae12f4e..3b8e49f 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) -- cgit v1.1 From 63000073963ee862dbb1b8c79478bcc4d7b8865b Mon Sep 17 00:00:00 2001 From: makise-homura Date: Mon, 13 Jan 2020 17:26:22 +0300 Subject: Fix broken link on Elbrus Fortran compiler Error is raised due to Elbrus Fortran compiler can't generate debug information for now, because it's a 2-step compiler where 1st step is code conversion from Fortran to C, so debug information which C compiler would produce, is useless. --- run_unittests.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'run_unittests.py') diff --git a/run_unittests.py b/run_unittests.py index 3b8e49f..ff9dbd6 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -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: -- cgit v1.1