Skip to content

Commit

Permalink
Revert "Bump GCC to 14.2.0"
Browse files Browse the repository at this point in the history
This reverts commit e1211ba.

This is done in an abundance of caution due to
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117675 even though it
appears that this issue doesn't cause a crash.
  • Loading branch information
fhunleth committed Nov 23, 2024
1 parent 3a44af1 commit 54bd6e4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 18 deletions.
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ defmodule NervesSystemOsd32mp1.MixProject do
[
{:nerves, "~> 1.11", runtime: false},
{:nerves_system_br, "1.29.1", runtime: false},
{:nerves_toolchain_armv7_nerves_linux_gnueabihf, "~> 14.2.0", runtime: false},
{:nerves_toolchain_armv7_nerves_linux_gnueabihf, "~> 13.2.0", runtime: false},
{:nerves_system_linter, "~> 0.4", only: [:dev, :test], runtime: false},
{:ex_doc, "~> 0.22", only: :docs, runtime: false}
]
Expand Down
16 changes: 0 additions & 16 deletions mix.lock

This file was deleted.

3 changes: 2 additions & 1 deletion nerves_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ BR2_cortex_a7=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v14.2.0/nerves_toolchain_armv7_nerves_linux_gnueabihf-linux_${shell uname -m}-14.2.0-6442318.tar.xz"
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v13.2.0/nerves_toolchain_armv7_nerves_linux_gnueabihf-linux_${shell uname -m}-13.2.0-BE3EA83.tar.xz"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="armv7-nerves-linux-gnueabihf"
BR2_TOOLCHAIN_EXTERNAL_GCC_13=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set
Expand Down

0 comments on commit 54bd6e4

Please sign in to comment.