diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-01 09:49:37 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-02 18:01:39 +0300 |
| commit | ea3e03ffdd864d9860948874407a6c5434690682 (patch) | |
| tree | f08a1db2b809d4262d29db06bdffe1dc40d2b53c /run_project_tests.py | |
| parent | 5bdd75940bcbf83dfd1c1ca6f2dd6fbdf7332c16 (diff) | |
| download | meson-ea3e03ffdd864d9860948874407a6c5434690682.zip meson-ea3e03ffdd864d9860948874407a6c5434690682.tar.gz meson-ea3e03ffdd864d9860948874407a6c5434690682.tar.bz2 | |
Handle objc compiler missing more reliably.
Diffstat (limited to 'run_project_tests.py')
| -rwxr-xr-x | run_project_tests.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 69a778e..d7ad257 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -420,14 +420,17 @@ def have_d_compiler(): def have_objc_compiler(): with AutoDeletedDir(tempfile.mkdtemp(prefix='b ', dir='.')) as build_dir: env = environment.Environment(None, build_dir, None, get_fake_options('/'), []) - objc_comp = env.detect_objc_compiler(False) + try: + objc_comp = env.detect_objc_compiler(False) + except: + return False if not objc_comp: return False try: objc_comp.sanity_check(env.get_scratch_dir(), env) + objcpp_comp = env.detect_objc_compiler(False) except: return False - objcpp_comp = env.detect_objc_compiler(False) if not objcpp_comp: return False try: |