feat: update ARM linker configurations to use arm-none-eabi-gcc

Signed-off-by: simonsan <[email protected]>
rustic-rs · Nov 30, 2024 · cd32907 · cd32907
1 parent 17f5a24
commit cd32907
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -4,10 +4,10 @@ rustdocflags = ["--document-private-items"]
 # incremental = true
 
 [target.armv7-unknown-linux-gnueabihf]
-linker = "arm-linux-gnueabihf-gcc"
+linker = "arm-none-eabi-gcc"
 
 [target.armv7-unknown-linux-musleabihf]
-linker = "arm-linux-gnueabihf-gcc"
+linker = "arm-none-eabi-gcc"
 
 [target.aarch64-unknown-linux-gnu]
 linker = "aarch64-linux-gnu-gcc"
@@ -21,5 +21,5 @@ linker = "i686-linux-gnu-gcc"
 [env]
 CC_i686-unknown-linux-gnu = "i686-linux-gnu-gcc"
 CC_aarch64_unknown_linux_musl = "aarch64-linux-gnu-gcc"
-CC_armv7_unknown_linux_gnueabihf = "arm-linux-gnueabihf-gcc"
-CC_armv7_unknown_linux_musleabihf = "arm-linux-gnueabihf-gcc"
+CC_armv7_unknown_linux_gnueabihf = "arm-none-eabi-gcc"
+CC_armv7_unknown_linux_musleabihf = "arm-none-eabi-gcc"
diff --git a/.github/install-arm-linkers.yml b/.github/install-arm-linkers.yml
@@ -2,4 +2,4 @@
   if: runner.os == 'Linux'
   run: |
     sudo apt install gcc-aarch64-linux-gnu
-    sudo apt install gcc-arm-linux-gnueabihf
+    sudo apt install arm-none-eabi-gcc
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -123,7 +123,7 @@ jobs:
         if: "runner.os == 'Linux'"
         run: |
           sudo apt install gcc-aarch64-linux-gnu
-          sudo apt install gcc-arm-linux-gnueabihf
+          sudo apt install arm-none-eabi-gcc
       - uses: swatinem/rust-cache@v2
         with:
           key: ${{ join(matrix.targets, '-') }}

diff --git a/dist-workspace.toml b/dist-workspace.toml
@@ -12,7 +12,7 @@ ci = "github"
 # The installers to generate for each app
 installers = ["shell", "powershell", "homebrew", "msi"]
 # Target platforms to build apps for (Rust target-triple syntax)
-targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc", "i686-unknown-linux-gnu"]
+targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "armv7-unknown-linux-gnueabihf", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc", "i686-unknown-linux-gnu"]
 # Path that installers should place binaries in
 install-path = "CARGO_HOME"
 # Whether to install an updater program
@@ -48,5 +48,6 @@ gcc-aarch64-linux-gnu = { version = '*', targets = ["aarch64-unknown-linux-gnu",
 gcc-arm-linux-gnueabihf = { version = '*', targets = ["armv7-unknown-linux-gnueabihf", "armv7-unknown-linux-musleabihf"] }
 gcc-i686-linux-gnu = { version = '*', targets = ["i686-unknown-linux-gnu"] }
 gcc-multilib-i686-linux-gnu =  { version = '*', targets = ["i686-unknown-linux-gnu"] }
+arm-none-eabi-gcc = { version = '*', targets = ["armv7-unknown-linux-gnueabihf", "armv7-unknown-linux-musleabihf"] }
 musl-tools = { version = '*', targets = ["aarch64-unknown-linux-musl", "x86_64-unknown-linux-musl", "armv7-unknown-linux-musleabihf"] }
 musl-dev = { version = '*', targets = ["aarch64-unknown-linux-musl", "x86_64-unknown-linux-musl", "armv7-unknown-linux-musleabihf"] }