diff --git a/ci-targets.yaml b/ci-targets.yaml index 1a8908c5..918dde6c 100644 --- a/ci-targets.yaml +++ b/ci-targets.yaml @@ -71,7 +71,7 @@ linux: build_options: - debug - noopt - - lto + - pgo+lto build_options_conditional: - options: - freethreaded+debug @@ -92,7 +92,7 @@ linux: build_options: - debug - noopt - - lto + - pgo+lto build_options_conditional: - options: - freethreaded+debug @@ -113,7 +113,7 @@ linux: build_options: - debug - noopt - - lto + - pgo+lto build_options_conditional: - options: - freethreaded+debug @@ -134,7 +134,7 @@ linux: build_options: - debug - noopt - - lto + - pgo+lto build_options_conditional: - options: - freethreaded+debug @@ -155,7 +155,7 @@ linux: build_options: - debug - noopt - - lto + - pgo+lto build_options_conditional: - options: - freethreaded+debug @@ -262,12 +262,12 @@ linux: - lto+static - debug - noopt - - lto + - pgo+lto build_options_conditional: - options: - freethreaded+debug - freethreaded+noopt - - freethreaded+lto + - freethreaded+pgo+lto minimum-python-version: "3.13" run: true @@ -288,12 +288,12 @@ linux: - lto+static - debug - noopt - - lto + - pgo+lto build_options_conditional: - options: - freethreaded+debug - freethreaded+noopt - - freethreaded+lto + - freethreaded+pgo+lto minimum-python-version: "3.13" run: true @@ -314,12 +314,12 @@ linux: - lto+static - debug - noopt - - lto + - pgo+lto build_options_conditional: - options: - freethreaded+debug - freethreaded+noopt - - freethreaded+lto + - freethreaded+pgo+lto minimum-python-version: "3.13" run: true @@ -340,12 +340,12 @@ linux: - lto+static - debug - noopt - - lto + - pgo+lto build_options_conditional: - options: - freethreaded+debug - freethreaded+noopt - - freethreaded+lto + - freethreaded+pgo+lto minimum-python-version: "3.13" run: true @@ -366,12 +366,12 @@ linux: # - lto+static - debug - noopt - - lto + - pgo+lto build_options_conditional: - options: - freethreaded+debug - freethreaded+noopt - - freethreaded+lto + - freethreaded+pgo+lto minimum-python-version: "3.13" run: true diff --git a/cpython-unix/build-cpython.sh b/cpython-unix/build-cpython.sh index 8504fb8e..1c9c0540 100755 --- a/cpython-unix/build-cpython.sh +++ b/cpython-unix/build-cpython.sh @@ -466,8 +466,8 @@ if [ -n "${CPYTHON_OPTIMIZED}" ]; then CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --enable-bolt" fi - # Allow users to enable the experimental JIT on 3.13+ - if [[ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]]; then + # Allow users to enable the experimental JIT on 3.13+ (but not on musl) + if [[ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" && ! "${CC}" = "musl-clang" ]]; then # Do not enable on x86-64 macOS because the JIT requires macOS 11+ and we are currently # using 10.15 as a minimum version.