From d98c6adb122f8e9cbc37f5df48c61b120c2a07a2 Mon Sep 17 00:00:00 2001
From: yellowhatter <bannov.dy@gmail.com>
Date: Thu, 8 Jun 2023 12:12:35 +0300
Subject: [PATCH] Trying to apply
 https://github.com/rust-lang/rust/issues/46651

---
 .cargo/config.toml            | 17 +++++++++-
 .github/workflows/release.yml | 60 +++++++++++++++++------------------
 2 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index f3a55b7..a687732 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,2 +1,17 @@
 [env]
-RUST_BACKTRACE = { value = "full", force = true }
+#RUST_BACKTRACE = { value = "full", force = true }
+
+[target.x86_64-unknown-linux-musl]
+rustflags = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ]
+
+[target.arm-unknown-linux-gnueabi]
+rustflags = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ]
+
+[target.armv7-unknown-linux-gnueabihf]
+rustflags = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ]
+
+[target.aarch64-unknown-linux-gnu]
+rustflags = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ]
+
+[target.aarch64-unknown-linux-musl]
+rustflags = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ]
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8e42b03..40b5e3b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -93,42 +93,42 @@ jobs:
           - { target: x86_64-unknown-linux-gnu, arch: amd64, os: ubuntu-20.04 }
           - { target: x86_64-apple-darwin, arch: darwin, os: macos-latest }
           - { target: aarch64-apple-darwin, arch: darwin, os: macos-latest }
-          # - {
-          #     target: x86_64-unknown-linux-musl,
-          #     arch: amd64,
-          #     os: ubuntu-20.04,
-          #     use-cross: true,
-          #   }
-          # - {
-          #     target: arm-unknown-linux-gnueabi,
-          #     arch: armel,
-          #     os: ubuntu-20.04,
-          #     use-cross: true,
-          #   }
+          - {
+              target: x86_64-unknown-linux-musl,
+              arch: amd64,
+              os: ubuntu-20.04,
+              use-cross: true,
+            }
+          - {
+              target: arm-unknown-linux-gnueabi,
+              arch: armel,
+              os: ubuntu-20.04,
+              use-cross: true,
+            }
           - {
               target: arm-unknown-linux-gnueabihf,
               arch: armhf,
               os: ubuntu-20.04,
               use-cross: true,
             }
-          # - {
-          #     target: armv7-unknown-linux-gnueabihf,
-          #     arch: armhf,
-          #     os: ubuntu-20.04,
-          #     use-cross: true,
-          #   }
-          # - {
-          #     target: aarch64-unknown-linux-gnu,
-          #     arch: arm64,
-          #     os: ubuntu-20.04,
-          #     use-cross: true,
-          #   }
-          # - {
-          #     target: aarch64-unknown-linux-musl,
-          #     arch: arm64,
-          #     os: ubuntu-20.04,
-          #     use-cross: true,
-          #   }
+          - {
+              target: armv7-unknown-linux-gnueabihf,
+              arch: armhf,
+              os: ubuntu-20.04,
+              use-cross: true,
+            }
+          - {
+              target: aarch64-unknown-linux-gnu,
+              arch: arm64,
+              os: ubuntu-20.04,
+              use-cross: true,
+            }
+          - {
+              target: aarch64-unknown-linux-musl,
+              arch: arm64,
+              os: ubuntu-20.04,
+              use-cross: true,
+            }
           # - { target: x86_64-pc-windows-msvc, arch: win64, os: windows-2019 }
           # - { target: x86_64-pc-windows-gnu         , arch: win64 , os: windows-2019                  }
     steps: