Trying to apply rust-lang/rust#46651

ZettaScaleLabs · Jun 8, 2023 · d98c6ad · d98c6ad
1 parent 60529ec
commit d98c6ad
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 31 deletions.
diff --git 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
@@ -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: