Skip to content

Commit 42ac767

Browse files
committed
Attempt to link python library to pgo build
There's probably a nicer way of figuring out the directory and name of libpython<optional-version-number>.dylib but this works locally
1 parent 81269f7 commit 42ac767

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

.github/workflows/wheels-build.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,18 @@ jobs:
107107
INSTALL_RUST_PATH=tools/install_rust.sh
108108
RUST_TOOLCHAIN=stable
109109
fi
110+
if [[ `uname -m` == "aarch64" || `uname -m` == "arm64" ]] ; then
111+
PYLIB=$(python -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))")
112+
PYNAME=$(find $PYLIB -maxdepth 1 -name "libpython*" | grep -oE "[^/]+$" | grep -oE "python[0-9]+\.[0-9]+" || echo "python")
113+
MACOSX_LDFLAGS="-L $PYLIB -l $PYNAME"
114+
else
115+
MACOSX_LDFLAGS=""
116+
fi
110117
cat >>"$GITHUB_ENV" <<EOF
111118
CIBW_BEFORE_ALL_LINUX=yum install -y wget && {package}/$INSTALL_RUST_PATH
112119
CIBW_BEFORE_BUILD=bash ./tools/build_pgo.sh $PGO_WORK_DIR $PGO_OUT_PATH
113120
CIBW_ENVIRONMENT=RUSTUP_TOOLCHAIN=stable RUSTFLAGS='-Cprofile-use=$PGO_OUT_PATH -Cllvm-args=-pgo-warn-missing-function'
114-
CIBW_ENVIRONMENT_MACOS=MACOSX_DEPLOYMENT_TARGET='10.12' RUSTUP_TOOLCHAIN=stable RUSTFLAGS='-Cprofile-use=$PGO_OUT_PATH -Cllvm-args=-pgo-warn-missing-function'
121+
CIBW_ENVIRONMENT_MACOS=MACOSX_DEPLOYMENT_TARGET='10.12' RUSTUP_TOOLCHAIN=stable RUSTFLAGS='-Cprofile-use=$PGO_OUT_PATH -Cllvm-args=-pgo-warn-missing-function $MACOSX_LDFLAGS'
115122
CIBW_ENVIRONMENT_LINUX=RUSTUP_TOOLCHAIN=$RUST_TOOLCHAIN RUSTFLAGS='-Cprofile-use=$PGO_OUT_PATH -Cllvm-args=-pgo-warn-missing-function' PATH="\$PATH:\$HOME/.cargo/bin" CARGO_NET_GIT_FETCH_WITH_CLI="true"
116123
EOF
117124
env:

.github/workflows/wheels.yml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
tags:
66
- '*'
7+
branches: ['dnm-fix-macos-pgo']
78
jobs:
89
build-core:
910
name: Build core

0 commit comments

Comments
 (0)