summaryrefslogtreecommitdiffhomepage
path: root/build.sh
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2024-01-09 16:32:28 +0100
committerOskar Nyberg <oskar@mullvad.net>2024-01-15 16:30:01 +0100
commit441466e650d541c88ae246cf5cb110a90cee9898 (patch)
tree47daf5aea4f1474a8c2aa7bf69666a1f281fc089 /build.sh
parent6bc4b86b278ec0b4187b35294ab7e889b638504d (diff)
downloadmullvadvpn-441466e650d541c88ae246cf5cb110a90cee9898.tar.xz
mullvadvpn-441466e650d541c88ae246cf5cb110a90cee9898.zip
Fix binaries paths in mac build
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/build.sh b/build.sh
index ad75236c7e..2ab5e0e290 100755
--- a/build.sh
+++ b/build.sh
@@ -8,6 +8,7 @@ set -eu
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd "$SCRIPT_DIR"
+source scripts/utils/host
source scripts/utils/log
################################################################################
@@ -71,6 +72,8 @@ if [[ -n ${TARGETS:-""} ]]; then
NPM_PACK_ARGS+=(--targets "${TARGETS[*]}")
fi
+NPM_PACK_ARGS+=(--host-target-triple "$HOST")
+
if [[ "$UNIVERSAL" == "true" ]]; then
if [[ -n ${TARGETS:-""} ]]; then
log_error "'TARGETS' and '--universal' cannot be specified simultaneously."
@@ -79,8 +82,6 @@ if [[ "$UNIVERSAL" == "true" ]]; then
log_info "Building universal macOS distribution"
fi
- source env.sh
-
# Universal macOS builds package targets for both aarch64-apple-darwin and x86_64-apple-darwin.
# We leave the target corresponding to the host machine empty to avoid rebuilding multiple times.
# When the --target flag is provided to cargo it always puts the build in the target/$ENV_TARGET