GreekStapler
/
vieter
forked from vieter-v/vieter
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Added way to specify V path in CI

main
Jef Roosens 2022-01-27 19:24:35 +01:00
parent 78e343fae2
commit 4084e3c857
Signed by untrusted user: Jef Roosens
GPG Key ID: 955C0660072F691F
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile.builder
View File

@ -7,6 +7,7 @@ WORKDIR /opt/vlang
ENV VVV /opt/vlang ENV VVV /opt/vlang
ENV PATH /opt/vlang:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ENV PATH /opt/vlang:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV VFLAGS -cc gcc ENV VFLAGS -cc gcc
ENV V_PATH /opt/vlang/v
RUN ln -s /opt/vlang/v /usr/bin/v && \ RUN ln -s /opt/vlang/v /usr/bin/v && \
apk --no-cache add \ apk --no-cache add \

3
Makefile
View File

@ -7,10 +7,11 @@ LARCHIVE_DIR := libarchive-$(LARCHIVE_VER)
LARCHIVE_LIB := $(LARCHIVE_DIR)/libarchive/libarchive.so LARCHIVE_LIB := $(LARCHIVE_DIR)/libarchive/libarchive.so
V_RELEASE := weekly.2022.04 V_RELEASE := weekly.2022.04
V_PATH ?= v-$(V_RELEASE)/v
# Custom V command for linking libarchive # Custom V command for linking libarchive
# V := LDFLAGS=$(PWD)/$(LARCHIVE_LIB) v -cflags '-I$(PWD)/$(LARCHIVE_DIR) -I $(PWD)/$(LARCHIVE_DIR)' # V := LDFLAGS=$(PWD)/$(LARCHIVE_LIB) v -cflags '-I$(PWD)/$(LARCHIVE_DIR) -I $(PWD)/$(LARCHIVE_DIR)'
V := v-$(V_RELEASE)/v -showcc V := $(V_PATH) -showcc
all: vieter all: vieter