revert

zhangbo8418 · Aug 18, 2024 · 4e084c5 · 4e084c5
1 parent d1fe617
commit 4e084c5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -6,5 +6,8 @@ rustflags = ["-C", "target-feature=+crt-static", "-C", "link-args=/NODEFAULTLIB:
 rustflags = [
     "-C", "link-args=-sectcreate __CGPreLoginApp __cgpreloginapp /dev/null",
 ]
-[target.'cfg(target_os="linux")']
-rustflags = ["-Ctarget-feature=+crt-static"]
+#[target.'cfg(target_os="linux")']
+# glibc-static required, this may fix https://github.com/rustdesk/rustdesk/issues/9103, but I do not wanna to this big change
+#rustflags = [
+#    "-C", "link-args=-Wl,-Bstatic -lc -Wl,-Bdynamic"
+#]
diff --git a/appimage/AppImageBuilder-aarch64.yml b/appimage/AppImageBuilder-aarch64.yml
@@ -37,6 +37,7 @@ AppDir:
         universe multiverse
       key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32'
     include:
+    - libc6:arm64
     - libgtk-3-0
     - libxcb-randr0
     - libxdo3

diff --git a/appimage/AppImageBuilder-x86_64.yml b/appimage/AppImageBuilder-x86_64.yml
@@ -37,6 +37,9 @@ AppDir:
     - sourceline: deb http://archive.ubuntu.com/ubuntu/ focal-security main restricted
         universe multiverse
     include:
+    # https://github.com/rustdesk/rustdesk/issues/9103
+    # because of APPDIR_LIBRARY_PATH, this libc6 is not used, use LD_PRELOAD: $APPDIR/usr/lib/x86_64-linux-gnu/libc.so.6 may help, but I do not wanna try.
+    - libc6:amd64
     - libgtk-3-0
     - libxcb-randr0
     - libxdo3