Skip to content

fix(build): set target_arch to fix NSS build on Apple Silicon #6713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(build): set target_arch to fix NSS build on Apple Silicon #6713

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions libs/build-nss-desktop.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,17 @@ elif [[ -n "${CROSS_COMPILE_TARGET}" ]]; then
elif [[ "$(uname -s)" == "Darwin" ]]; then
TARGET_OS="macos"
# We need to set this variable for switching libs based on different macos archs (M1 vs Intel)
# Also set lowercase target_arch which gyp expects
if [[ "$(uname -m)" == "arm64" ]]; then
DIST_DIR=$(abspath "desktop/darwin-aarch64/nss")
TARGET_ARCH="aarch64"
target_arch="$(uname -m)"
export target_arch
else
DIST_DIR=$(abspath "desktop/darwin-x86-64/nss")
TARGET_ARCH="x86_64"
target_arch="$(uname -m)"
export target_arch
fi
elif [[ "$(uname -s)" == "Linux" ]]; then
# This is a JNA weirdness: "x86-64" rather than "x86_64".
Expand Down