зеркало из https://github.com/electron/electron.git
23 строки
1.1 KiB
Diff
23 строки
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Tue, 28 May 2019 18:12:17 -0700
|
|
Subject: fix_breakpad_symbol_generation_on_linux_arm.patch
|
|
|
|
Fixes broken Linux ARM breakpad symbol generation by patching
|
|
out an `ldd`-related call that was throwing.
|
|
|
|
diff --git a/components/crash/content/tools/generate_breakpad_symbols.py b/components/crash/content/tools/generate_breakpad_symbols.py
|
|
index 7ecc72117881fdfa64170d62f94627a7f6dda7ad..62c9dfaf7f4ac1bfaf6e453fad90bda66f682864 100755
|
|
--- a/components/crash/content/tools/generate_breakpad_symbols.py
|
|
+++ b/components/crash/content/tools/generate_breakpad_symbols.py
|
|
@@ -67,7 +67,8 @@ def GetSharedLibraryDependenciesLinux(binary, options):
|
|
"""Return absolute paths to all shared library dependencies of the binary.
|
|
|
|
This implementation assumes that we're running on a Linux system."""
|
|
- ldd = subprocess.check_output(['ldd', binary])
|
|
+ p = subprocess.Popen(['ldd', binary], stdout=subprocess.PIPE)
|
|
+ ldd = p.communicate()[0]
|
|
lib_re = re.compile('\t.* => (.+) \(.*\)$')
|
|
result = []
|
|
for line in ldd.splitlines():
|