ewilliams28/releases
1
0
Fork 0
mirror of https://github.com/open-policy-agent/opa.git synced 2026-08-13 03:42:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

wasm: Upgrade to clang 11.

Browse Source 
Prepares the builder for compiling C++.

Signed-off-by: Teemu Koponen <koponen@styra.com>
This commit is contained in:
Teemu Koponen
2020-10-16 13:23:47 -07:00
committed by Torin Sandall
parent 78d9bf1aed
commit d765a55f16
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wasm/Dockerfile
+14 -12
View File
@@ -1,26 +1,28 @@
FROM ubuntu:18.04
FROM ubuntu:20.04
RUN apt-get update && apt-get install -y curl git build-essential python
RUN bash -c 'echo -ne "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main\ndeb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic main" > /etc/apt/sources.list.d/llvm.list'
RUN bash -c 'echo -ne "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main\ndeb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main" > /etc/apt/sources.list.d/llvm.list'
RUN curl -L https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install -y \
cmake \
clang-10 \
lld-10
clang-11 \
libc++-11-dev libc++abi-11-dev \
lld-11
ENV CC=clang-10
ENV CXX=clang-10
ENV LLD=wasm-ld-10
ENV AR=llvm-ar-10
ENV RANLIB=llvm-ranlib-10
ENV CC=clang-11
ENV CXX=clang-11
ENV LLD=wasm-ld-11
ENV AR=llvm-ar-11
ENV RANLIB=llvm-ranlib-11
RUN ln -s /usr/bin/clang-10 /usr/bin/clang && \
ln -s /usr/bin/clang++-10 /usr/bin/clang++ && \
ln -s /usr/bin/clang-cpp-10 /usr/bin/clang-cpp
RUN ln -s /usr/bin/clang-11 /usr/bin/clang && \
ln -s /usr/bin/clang++-11 /usr/bin/clang++ && \
ln -s /usr/bin/clang-cpp-11 /usr/bin/clang-cpp
RUN git clone https://github.com/WebAssembly/wabt && \
cd wabt && \
wasm/Makefile
+3 -3
View File
@@ -9,7 +9,7 @@ DOCKER_FLAGS += -it
endif
DOCKER_WASM_BUILDER_IMAGE ?= openpolicyagent/opa-wasm-builder
WASM_BUILDER_VERSION := 1.1
WASM_BUILDER_VERSION := 1.2
WASM_BUILDER_IMAGE := $(DOCKER_WASM_BUILDER_IMAGE):$(WASM_BUILDER_VERSION)
WASM_OBJ_DIR := _obj
@@ -94,7 +94,7 @@ $(TEST_OBJS): $(WASM_OBJ_DIR)/tests/%.wasm: tests/%.c
$(CC) $(CFLAGS) -I src -c -o $@ $<
$(WASM_OBJ_DIR)/opa.wasm: $(OBJS) $(LIB_OBJS) $(LIB_MPDEC_OBJS)
wasm-ld-10 \
wasm-ld-11 \
--allow-undefined-file=src/undefined.symbols \
--import-memory \
--no-entry \
@@ -104,7 +104,7 @@ $(WASM_OBJ_DIR)/opa.wasm: $(OBJS) $(LIB_OBJS) $(LIB_MPDEC_OBJS)
$(WASM_OBJ_DIR)/opa-test.wasm: $(OBJS) $(LIB_OBJS) $(LIB_MPDEC_OBJS) $(TEST_OBJS)
@cat src/undefined.symbols tests/undefined.symbols > _obj/undefined.symbols
@wasm-ld-10 \
@wasm-ld-11 \
--allow-undefined-file=_obj/undefined.symbols \
--import-memory \
--no-entry \