From 19c01aa7721149e6cd35a74c5618b5f2a5a26e93 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Sat, 17 Apr 2021 09:46:30 +0200
Subject: mkvenv: Handle failing ldconfig

(cherry picked from commit 1b4daf7c37782bf6a63814c5e9cdc0bebec559ea)
---
 scripts/mkvenv.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/mkvenv.py b/scripts/mkvenv.py
index 51b10d254..31b185fe1 100755
--- a/scripts/mkvenv.py
+++ b/scripts/mkvenv.py
@@ -271,7 +271,13 @@ def apply_xcb_util_workaround(
         print("Workaround not needed: Not installing Qt 5.15.")
         return
 
-    libs = _find_libs()
+    try:
+        libs = _find_libs()
+    except subprocess.CalledProcessError as e:
+        utils.print_error(
+            f'Workaround failed: ldconfig exited with status {e.returncode}')
+        return
+
     abi_type = 'libc6,x86-64'  # the only one PyQt wheels are available for
 
     if ('libxcb-util.so.1', abi_type) in libs:
-- 
cgit v1.2.3-54-g00ecf