Updater: fix platform tags for riscv and mac-arm64

diff --git a/cmake/config-feather.h.cmake b/cmake/config-feather.h.cmake
index 55fa424483d98526cfb4a90c9e9eb77f99da753e..c062336b9e9792bb90535a57832c47bb413d7bad 100644 (file)
--- a/cmake/config-feather.h.cmake
+++ b/cmake/config-feather.h.cmake
@@ -6,4 +6,6 @@
 
 #define TOR_VERSION "@TOR_VERSION@"
 
+#define FEATHER_TARGET_TRIPLET "@FEATHER_TARGET_TRIPLET@"
+
 #endif //FEATHER_VERSION_H

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 746a244f6762a1aa7ce63a08994ca174303f25e1..3ef6fb96a97034d441f22fc7e2ff2250a11d5147 100755 (executable)
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -273,7 +273,7 @@ mkdir -p "$DISTSRC"
 
 
     # Set appropriate CMake options for build type
-    CMAKEVARS="-DWITH_SCANNER=On -DCHECK_UPDATES=On -DSELF_CONTAINED=On -DDONATE_BEG=On"
+    CMAKEVARS="-DWITH_SCANNER=On -DCHECK_UPDATES=On -DSELF_CONTAINED=On -DDONATE_BEG=On -DFEATHER_TARGET_TRIPLET=${HOST}"
     ANONDIST=""
     case "$HOST" in
         *mingw32)

diff --git a/src/utils/Updater.cpp b/src/utils/Updater.cpp
index 35ea69282da92132caf51d8aeaa488edf50c6955..685d38249e9c2e11bc7efbb3bb042b92bbf9f77d 100644 (file)
--- a/src/utils/Updater.cpp
+++ b/src/utils/Updater.cpp
@@ -133,7 +133,11 @@ void Updater::onSignedHashesReceived(QNetworkReply *reply, const QString &platfo
 
 QString Updater::getPlatformTag() {
 #ifdef Q_OS_MACOS
-    return "mac";
+    if (QString(FEATHER_TARGET_TRIPLET) == "arm64-apple-darwin") {
+        return "mac-arm64";
+    } else {
+        return "mac";
+    }
 #endif
 #ifdef Q_OS_WIN
     #ifdef PLATFORM_INSTALLER
@@ -149,6 +153,8 @@ QString Updater::getPlatformTag() {
         tag += "linux-arm64";
     } else if (arch == "arm") {
         tag += "linux-arm";
+    } else if (arch == "riscv64") {
+        tag += "linux-riscv64";
     } else {
         tag += "linux";
     }