From e4f24524275107449b83110ca4c5f2ec044282fb Mon Sep 17 00:00:00 2001 From: Mikkel Kongsted Date: Mon, 16 Dec 2024 11:23:38 +0100 Subject: [PATCH] fix makefile and remove dev-env/ --- dev-env/Dockerfile | 5 ----- dev-env/run | 3 --- runtime/Dockerfile | 4 ++-- runtime/Makefile | 1 - 4 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 dev-env/Dockerfile delete mode 100644 dev-env/run diff --git a/dev-env/Dockerfile b/dev-env/Dockerfile deleted file mode 100644 index ff13038..0000000 --- a/dev-env/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM archlinux -RUN pacman -Syu --noconfirm -RUN pacman -S make clang git pkg-config --noconfirm -WORKDIR /workspace -ENTRYPOINT ["/bin/bash"] diff --git a/dev-env/run b/dev-env/run deleted file mode 100644 index 6b00638..0000000 --- a/dev-env/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -docker build -t slige-dev-env dev-env -docker run --name dev-env --rm -it --mount type=bind,source="$(pwd)"/,target=/workspace slige-dev-env diff --git a/runtime/Dockerfile b/runtime/Dockerfile index 970b425..b36dbc5 100644 --- a/runtime/Dockerfile +++ b/runtime/Dockerfile @@ -1,9 +1,9 @@ -from gcc +FROM gcc WORKDIR /workdir COPY . . -RUN make -j 8 +RUN make ENTRYPOINT [ "./build/sliger", "run", "out.slgbc" ] \ No newline at end of file diff --git a/runtime/Makefile b/runtime/Makefile index 24ae349..36817ee 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -38,7 +38,6 @@ all: build_dir $(OUT) $(OUT): $(CXX_OBJECTS) $(CXX) -o $@ $(CXX_FLAGS) $^ - git rev-parse HEAD > build/rev build_dir: mkdir -p build/