Skip to content

Commit 4cd160f

Browse files
committed
Fix "runshared" patch on 3.14
1 parent babae12 commit 4cd160f

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

cpython-unix/build-cpython.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@ fi
9696
# Configure nerfs RUNSHARED when cross-compiling, which prevents PGO from running when
9797
# we can in fact run the target binaries (e.g. x86_64 host and i686 target). Undo that.
9898
if [ -n "${CROSS_COMPILING}" ]; then
99-
if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
99+
if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_14}" ]; then
100+
patch -p1 -i ${ROOT}/patch-dont-clear-runshared-14.patch
101+
elif [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
100102
patch -p1 -i ${ROOT}/patch-dont-clear-runshared-13.patch
101103
elif [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_11}" ]; then
102104
patch -p1 -i ${ROOT}/patch-dont-clear-runshared.patch
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/configure b/configure
2+
index 57be576e3ca..a87c6eb8f2e 100755
3+
--- a/configure
4+
+++ b/configure
5+
@@ -7617,10 +7617,6 @@ fi
6+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LDLIBRARY" >&5
7+
printf "%s\n" "$LDLIBRARY" >&6; }
8+
9+
-if test "$cross_compiling" = yes; then
10+
- RUNSHARED=
11+
-fi
12+
-
13+
# HOSTRUNNER - Program to run CPython for the host platform
14+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking HOSTRUNNER" >&5
15+
printf %s "checking HOSTRUNNER... " >&6; }

0 commit comments

Comments
 (0)