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 d662c3a13030a02bcc1eaa90c5b0e34b19b3b2ee.

This is for consistency with other Nerves systems until
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117675 is resolved.
  • Loading branch information
fhunleth committed Nov 23, 2024
1 parent 2123078 commit 40fc843
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ defmodule NervesSystemVultr.MixProject do
[
{:nerves, "~> 1.11", runtime: false},
{:nerves_system_br, "1.29.1", runtime: false},
{:nerves_toolchain_x86_64_nerves_linux_musl, "~> 14.2.0", runtime: false},
{:nerves_toolchain_x86_64_nerves_linux_musl, "~> 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
4 changes: 2 additions & 2 deletions mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"nerves": {:hex, :nerves, "1.11.2", "a6733509c433f244aaf8a3aef28fcc3cc653fd5c5e3dc3f475b233730dbb1b2a", [:make, :mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "0b554421e7d1b82b03955fda3d966c83ab2414c5ed52f57ad7f4bcdc98279c57"},
"nerves_system_br": {:hex, :nerves_system_br, "1.29.1", "afa5337d66e9770d48dc8bf3a4da41f63dcbd1f0b4639d67fa08d449ad752668", [:mix], [], "hexpm", "33f5afe50fa603a8cdb22e281c18fb98de9f3012598af1ab77849d1dbe59747e"},
"nerves_system_linter": {:hex, :nerves_system_linter, "0.4.0", "81e9a6f5018fe5fb67d7b43a04dca36156f62b55b5554eb2fa3964d3889d09cd", [:mix], [], "hexpm", "b5bd8480ce7a6317f4601ff41fd2f594bdf76aff0bdf6dcfac571c3fa1ec5f82"},
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.11.0", "829b312eb94ea2bc4733299aeccbe1bbe67430cebf2d23cc28df7cc2ea7dc572", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "c98ab17dd2210a50e948fb5ae4ef418e651e10cbb868f00c39a1f3541cec5467"},
"nerves_toolchain_x86_64_nerves_linux_musl": {:hex, :nerves_toolchain_x86_64_nerves_linux_musl, "14.2.0", "e29343d43b52a1be797336f998688835df02483eacc6a47c079bf4fe67b58fd5", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.11.0", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "c33f53b72cd506b9ef0db7202b66fd92c802370141c928ba1585e4103d986b94"},
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.10.0", "c6b35377a0b7a93633a8673a788f1580fe1fa06083374b0e4df36da65828d2ef", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "e4ae1a2b84de3502ecac195765819be0ce2834eb276553163a7c03133f1760f1"},
"nerves_toolchain_x86_64_nerves_linux_musl": {:hex, :nerves_toolchain_x86_64_nerves_linux_musl, "13.2.0", "1896dc1576363e16276164cf350e98493a9b9b9391eafa94315a82adf97d94ea", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.10.0", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "be6214995b7ee181f9e8ebb4148312775c0a626b857f0bb4688d8efda8844cba"},
"nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
}
3 changes: 2 additions & 1 deletion nerves_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ BR2_x86_64=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_x86_64_nerves_linux_musl-linux_${shell uname -m}-14.2.0-E576787.tar.xz"
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v13.2.0/nerves_toolchain_x86_64_nerves_linux_musl-linux_${shell uname -m}-13.2.0-8123CAA.tar.xz"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-nerves-linux-musl"
BR2_TOOLCHAIN_EXTERNAL_GCC_13=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
Expand Down

0 comments on commit 40fc843

Please sign in to comment.