瀏覽代碼

rust 1.48.0 required

Signed-off-by: Sean Young <sean@mess.org>
Sean Young 4 年之前
父節點
當前提交
3c13bdbb9e
共有 5 個文件被更改,包括 3 次插入5 次删除
  1. 0 2
      Dockerfile
  2. 1 1
      docs/installing.rst
  3. 1 1
      scripts/ci.dockerfile
  4. 二進制
      stdlib/wasm/wasmheap.bc
  5. 1 1
      stdlib/wasmheap.c

+ 0 - 2
Dockerfile

@@ -18,6 +18,4 @@ RUN cargo build --release
 FROM ubuntu:18.04
 COPY --from=builder /src/target/release/solang /usr/bin/solang
 
-ENV PATH="/llvm10.0/bin:${PATH}"
-
 ENTRYPOINT ["/usr/bin/solang"]

+ 1 - 1
docs/installing.rst

@@ -50,7 +50,7 @@ Then you can build the image using:
 Building Solang from source
 ---------------------------
 
-In order to build Solang from source, you will need rust 1.43.0 or higher,
+In order to build Solang from source, you will need rust 1.48.0 or higher,
 and a build of llvm based on our tree. There are a few patches which are not upstream yet
 First, follow the steps below for installing llvm and then proceed from there.
 

+ 1 - 1
scripts/ci.dockerfile

@@ -25,7 +25,7 @@ RUN apt-get clean
 RUN apt-get autoclean
 
 # Get Rust
-RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
+RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain 1.48.0
 
 COPY --from=builder /llvm10.0 /llvm10.0/
 

二進制
stdlib/wasm/wasmheap.bc


+ 1 - 1
stdlib/wasmheap.c

@@ -77,7 +77,7 @@ static void shrink_chunk(struct chunk *cur, size_t size)
     }
 }
 
-void *__attribute__((noinline)) __malloc(size_t size)
+void *__attribute__((noinline)) __malloc(uint32_t size)
 {
     struct chunk *cur = (struct chunk *)0x10000;