Merge 0200ed1 into 7f11678

astropy · Jul 24, 2018 · 15f0df6 · 15f0df6
2 parents 7f11678 + 0200ed1
commit 15f0df6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/astropy_helpers/openmp_helpers.py b/astropy_helpers/openmp_helpers.py
@@ -206,7 +206,7 @@ def check_openmp_support(openmp_flags=None):
             log.warn("Unexpected output from test OpenMP "
                      "program (output was {0})".format(output))
             is_openmp_supported = False
-    except (CompileError, LinkError):
+    except (CompileError, LinkError, subprocess.CalledProcessError):
         is_openmp_supported = False
 
     finally: