Skip to content

Commit efa9e92

Browse files
committed
Fix remote debug builds
1 parent 217f7af commit efa9e92

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed

cpython-unix/build-cpython.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ else
8383
patch -p1 -i ${ROOT}/patch-xopen-source-ios-legacy.patch
8484
fi
8585

86+
# See https://github.com/python/cpython/pull/135146
87+
# TODO(zanieb): Drop in 3.14b3
88+
if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_14}" ]; then
89+
patch -p1 -i ${ROOT}/patch-static-remote-debug-3.14.patch
90+
fi
91+
8692
# LIBTOOL_CRUFT is unused and breaks cross-compiling on macOS. Nuke it.
8793
# Submitted upstream at https://github.com/python/cpython/pull/101048.
8894
if [ -n "${PYTHON_MEETS_MAXIMUM_VERSION_3_11}" ]; then
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/Python/remote_debug.h b/Python/remote_debug.h
2+
index 6cbf1c8deaa..ab494ea71da 100644
3+
--- a/Python/remote_debug.h
4+
+++ b/Python/remote_debug.h
5+
@@ -131,7 +131,7 @@ _Py_RemoteDebug_FreePageCache(proc_handle_t *handle)
6+
}
7+
}
8+
9+
-void
10+
+static void
11+
_Py_RemoteDebug_ClearCache(proc_handle_t *handle)
12+
{
13+
for (int i = 0; i < MAX_PAGES; i++) {
14+
@@ -989,7 +989,7 @@ _Py_RemoteDebug_ReadRemoteMemory(proc_handle_t *handle, uintptr_t remote_address
15+
#endif
16+
}
17+
18+
-int
19+
+static int
20+
_Py_RemoteDebug_PagedReadRemoteMemory(proc_handle_t *handle,
21+
uintptr_t addr,
22+
size_t size,

0 commit comments

Comments
 (0)