diff options
| author | David Lönnhager <david.l@mullvad.net> | 2022-08-23 13:40:14 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-08-23 13:40:14 +0200 |
| commit | 7dc36e0fb75403c634c2c90c52e710ce2115248c (patch) | |
| tree | 42671cabd83517a9be84422e321d935356a4c115 /gui/scripts | |
| parent | e7c9140c4c2555affdd4ed879cd1a3593bdea7cf (diff) | |
| parent | 2b6855070649663dbb66107660085e3e1994f8c9 (diff) | |
| download | mullvadvpn-7dc36e0fb75403c634c2c90c52e710ce2115248c.tar.xz mullvadvpn-7dc36e0fb75403c634c2c90c52e710ce2115248c.zip | |
Merge branch 'linux-aarch64-build'
Diffstat (limited to 'gui/scripts')
| -rwxr-xr-x | gui/scripts/build-proto.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gui/scripts/build-proto.sh b/gui/scripts/build-proto.sh index f2ee78e3af..5f8724a68c 100755 --- a/gui/scripts/build-proto.sh +++ b/gui/scripts/build-proto.sh @@ -5,7 +5,8 @@ set -eu SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd "$SCRIPT_DIR" -PLATFORM="$(uname -s)-$(uname -m)" +ARCH="$(uname -m)" +PLATFORM="$(uname -s)-${ARCH}" MANAGEMENT_INTERFACE_PROTO_BUILD_DIR=${MANAGEMENT_INTERFACE_PROTO_BUILD_DIR:-} NODE_MODULES_DIR="$(cd ../node_modules/.bin && pwd)" PROTO_DIR="../../mullvad-management-interface/proto" @@ -21,14 +22,14 @@ fi mkdir -p $DESTINATION_DIR mkdir -p $TYPES_DESTINATION_DIR -if [[ "${PLATFORM}" == "Darwin-arm64" ]]; then +if [[ "${ARCH,,}" == "arm64" || "${ARCH,,}" == "aarch64" ]]; then if [[ -n "${MANAGEMENT_INTERFACE_PROTO_BUILD_DIR}" ]]; then cp $MANAGEMENT_INTERFACE_PROTO_BUILD_DIR/*.js $DESTINATION_DIR cp $MANAGEMENT_INTERFACE_PROTO_BUILD_DIR/*.ts $TYPES_DESTINATION_DIR else - >&2 echo "Building management interface proto files on Apple Silicon is not supported" + >&2 echo "Building management interface proto files on aarch64 is not supported" >&2 echo "(see https://github.com/grpc/grpc-node/issues/1497)." - >&2 echo "Please build the proto files on another platform using build_mi_proto.sh script," + >&2 echo "Please build the proto files on another platform using build-proto.sh script," >&2 echo "and set MANAGEMENT_INTERFACE_PROTO_BUILD_DIR environment variable to the directory of the build." exit 1 fi |