Skip to content

Commit 9e15f25

Browse files
committed
dirty: Attempt to fix Docker build
1 parent ac49a11 commit 9e15f25

File tree

3 files changed

+33
-3
lines changed

3 files changed

+33
-3
lines changed

bench.Dockerfile

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
FROM ocaml/opam:debian-ocaml-5.3
22
WORKDIR /bench-dir
33
RUN sudo apt-get update
4-
RUN sudo apt-get install -qq -yy --no-install-recommends pkg-config libgmp-dev
4+
RUN sudo apt-get install -qq -yy --no-install-recommends pkg-config libgmp-dev \
5+
wget
56
RUN sudo ln -sf /usr/bin/opam-2.1 /usr/bin/opam
67
RUN opam remote add origin https://github.com/ocaml/opam-repository.git && \
78
opam update
9+
RUN wget https://nodejs.org/dist/v22.14.0/node-v22.14.0-linux-x64.tar.xz
10+
RUN tar xJvf node-v22.14.0-linux-x64.tar.xz
11+
RUN sudo cp node-v22.14.0-linux-x64/bin/node /usr/bin/node
812
COPY --chown=opam:opam . ./
913
RUN opam exec -- git init
1014
RUN opam exec -- git add .

binaryen-bin.opam

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
opam-version: "2.0"
2+
synopsis: "Compiler and toolchain infrastructure library for WebAssembly"
3+
description: """
4+
Binaryen is a compiler and toolchain infrastructure library for WebAssembly.
5+
It aims to make compiling to WebAssembly easy, fast, and effective.
6+
"""
7+
maintainer: "Jérôme Vouillon <jerome@tarides.com>"
8+
license: "Apache-2.0"
9+
authors: ["Alon Zakai" "Thomas Lively"]
10+
homepage: "https://github.com/WebAssembly/binaryen/"
11+
bug-reports: "https://github.com/ocaml-wasm/wasm_of_ocaml/issues"
12+
dev-repo: "git+https://github.com/WebAssembly/binaryen.git"
13+
depends: []
14+
build: [
15+
]
16+
install: [
17+
["cp" "bin/wasm-opt" "bin/wasm-metadce" "bin/wasm-merge" "%{bin}%"] { os-family != "windows" }
18+
["cp" "bin/wasm-opt.exe" "bin/wasm-metadce.exe" "bin/wasm-merge.exe" "%{bin}%"] { os-family = "windows" }
19+
]
20+
url {
21+
src:
22+
"https://github.com/WebAssembly/binaryen/releases/download/version_119/binaryen-version_119-x86_64-linux.tar.gz"
23+
checksum: [
24+
"md5=caa9f82ff119294240caee12de8497df"
25+
"sha512=09287200b1584e68379c16423a4559ce6af0eff9e2d0abf4cc22f8a72689c7246596c195e4e86973618e048857eac12b97fdf8530000d440dcda4514449e1336"
26+
]
27+
}

compiler/bin-wasm_of_ocaml/compile.ml

+1-2
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,7 @@ let run
462462
ic
463463
in
464464
if times () then Format.eprintf " parsing: %a@." Timer.print t1;
465-
Fs.with_intermediate_file
466-
(Filename.temp_file (Filename.chop_extension output_file) ".wat")
465+
Fs.with_intermediate_file (Filename.temp_file "output" ".wat")
467466
@@ fun wat_file ->
468467
let dir = Filename.chop_extension output_file ^ ".assets" in
469468
Link.gen_dir dir

0 commit comments

Comments
 (0)