summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2024-09-04 11:47:51 +0200
committerDavid Lönnhager <david.l@mullvad.net>2024-09-04 11:47:51 +0200
commitfd4604f8ff4462778103c8b7a2187348db9b433c (patch)
tree751aa30bc85964dffe324eef89d41874e3bd8f87
parent6cba30d237587f74436ffa0cc1cb0f8d01a7e141 (diff)
parent66cbe6a260d908a6bec95a6d0bab2937f5333e4b (diff)
downloadmullvadvpn-fd4604f8ff4462778103c8b7a2187348db9b433c.tar.xz
mullvadvpn-fd4604f8ff4462778103c8b7a2187348db9b433c.zip
Merge branch 'fix-arm64-talpid-openvpn-plugin-signature'
-rwxr-xr-xbuild.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index 4203865a23..ea26362103 100755
--- a/build.sh
+++ b/build.sh
@@ -287,13 +287,16 @@ function build {
done
if [[ "$current_target" == "aarch64-pc-windows-msvc" ]]; then
- # TODO: We still ship x64 OpenVPN with ARM64, so we need an x64 talpid-openvpn-plugin
+ # We ship x64 OpenVPN with ARM64, so we need an x64 talpid-openvpn-plugin
# to include in the package.
+ local source="$CARGO_TARGET_DIR/x86_64-pc-windows-msvc/$RUST_BUILD_MODE/talpid_openvpn_plugin.dll"
+ local destination="dist-assets/aarch64-pc-windows-msvc/talpid_openvpn_plugin.dll"
+
log_info "Workaround: building x64 talpid-openvpn-plugin"
cargo build --target x86_64-pc-windows-msvc "${CARGO_ARGS[@]}" -p talpid-openvpn-plugin --lib
- cp "$CARGO_TARGET_DIR/x86_64-pc-windows-msvc/$RUST_BUILD_MODE/talpid_openvpn_plugin.dll" "dist-assets/aarch64-pc-windows-msvc/talpid_openvpn_plugin.dll"
+ cp "$source" "$destination"
if [[ "$SIGN" == "true" ]]; then
- sign_win "dist-assets/talpid_openvpn_plugin.dll"
+ sign_win "$destination"
fi
fi
}