From 1bc050026feb20af88cf8dd07ad37754a3b70e61 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 14 Dec 2024 21:02:33 -0600 Subject: [PATCH 1/2] [ox/std] Fix compiler warning --- deps/ox/src/ox/std/reader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/ox/src/ox/std/reader.cpp b/deps/ox/src/ox/std/reader.cpp index 01596006..8b27729a 100644 --- a/deps/ox/src/ox/std/reader.cpp +++ b/deps/ox/src/ox/std/reader.cpp @@ -32,7 +32,7 @@ ox::Result StreamReader::peek() const noexcept { try { char c{}; m_strm.get(c); - auto const ok = c != EOF; + auto const ok = c != static_cast(EOF); if (ok && m_strm.unget()) [[unlikely]] { return ox::Error(1, "Unable to unget character"); } From cc4da3a4c4963a5dd008b54171ca22d148426779 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 14 Dec 2024 21:04:35 -0600 Subject: [PATCH 2/2] [buildcore] Map aarch64 to arm64 in util.get_arch --- deps/buildcore/scripts/util.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deps/buildcore/scripts/util.py b/deps/buildcore/scripts/util.py index 383ee5f4..44709247 100644 --- a/deps/buildcore/scripts/util.py +++ b/deps/buildcore/scripts/util.py @@ -35,4 +35,6 @@ def get_arch() -> str: arch = platform.machine().lower() if arch == 'amd64': arch = 'x86_64' + elif arch == 'aarch64': + arch = 'arm64' return arch