Skip to content

Commit 5d22d63

Browse files
committed
Update wasi-sdk and mlir
1 parent 0678382 commit 5d22d63

File tree

6 files changed

+13
-9
lines changed

6 files changed

+13
-9
lines changed

.devcontainer/features/wasi-sdk/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ if [ "$arch" == "aarch64" ]; then
88
arch="arm64"
99
fi
1010

11-
wget -nd -P /tmp/ https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-${arch}-linux.deb
11+
wget -nd -P /tmp/ https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-29/wasi-sdk-29.0-${arch}-linux.deb
1212

13-
dpkg -i /tmp/wasi-sdk-25.0-${arch}-linux.deb
13+
dpkg -i /tmp/wasi-sdk-29.0-${arch}-linux.deb

CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ FetchContent_GetProperties(utfcpp)
9999
#
100100
FetchContent_Declare(
101101
nlohmann_json
102-
URL https://github.com/nlohmann/json/releases/download/v3.11.3/include.zip
103-
URL_HASH SHA256=a22461d13119ac5c78f205d3df1db13403e58ce1bb1794edc9313677313f4a9d
102+
URL https://github.com/nlohmann/json/releases/download/v3.12.0/include.zip
103+
URL_HASH SHA256=b8cb0ef2dd7f57f18933997c9934bb1fa962594f701cd5a8d3c2c80541559372
104104
)
105105

106106
FetchContent_MakeAvailable(nlohmann_json)
@@ -111,7 +111,8 @@ set_target_properties(nlohmann_json::nlohmann_json PROPERTIES
111111

112112
FetchContent_Declare(
113113
wasi_sysroot
114-
URL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-27/wasi-sysroot-27.0.tar.gz
114+
URL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-29/wasi-sysroot-29.0.tar.gz
115+
URL_HASH SHA256=d99d5c4b277a725b7b56bf9d591609972ecac3207520a66408927280f191f6c7
115116
)
116117

117118
FetchContent_MakeAvailable(wasi_sysroot)
@@ -129,7 +130,8 @@ if (CXX_ENABLE_FLATBUFFERS)
129130

130131
FetchContent_Declare(
131132
flatbuffers
132-
URL https://github.com/google/flatbuffers/archive/refs/tags/v25.1.24.tar.gz
133+
URL https://github.com/google/flatbuffers/archive/refs/tags/v25.1.24.tar.gz
134+
URL_HASH SHA256=ffc668a310e77607d393f3c18b32715f223da1eac4c4d6e0579a11df8e6b59cf
133135
)
134136

135137
FetchContent_MakeAvailable(flatbuffers)

Dockerfile.wasi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-27
1+
FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-29
22

33
RUN apt-get update && apt-get install -y \
44
g++ \

scripts/build-mlir.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ async function downloadLLVM({ packages, version, outdir }) {
5151
}
5252

5353
async function main() {
54-
const version = "21.1.3";
54+
const version = "21.1.5";
5555
const packages = ["cmake", "third-party", "llvm", "mlir"];
5656

5757
const llvm_source_dir = zx.path.resolve(

src/parser/cxx/ast_cursor.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
#include <cxx/ast_cursor.h>
2323
#include <cxx/ast_slot.h>
2424

25+
#include <vector>
26+
2527
namespace cxx {
2628

2729
ASTCursor::ASTCursor(AST* root, std::string_view name) {

tests/unit_tests/sema/wasm_stdlib_01.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
#include <cctype>
44
#include <cstdio>
5-
#include <cstdlib>
5+
// #include <cstdlib>
66
#include <cstring>

0 commit comments

Comments
 (0)