From 4084e3c857b5976eb68658ca0d94ae6d1cbbdb93 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Thu, 27 Jan 2022 19:24:35 +0100 Subject: [PATCH] Added way to specify V path in CI --- Dockerfile.builder | 1 + Makefile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile.builder b/Dockerfile.builder index 1f44b4cf..55fa0925 100644 --- a/Dockerfile.builder +++ b/Dockerfile.builder @@ -7,6 +7,7 @@ WORKDIR /opt/vlang ENV VVV /opt/vlang ENV PATH /opt/vlang:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ENV VFLAGS -cc gcc +ENV V_PATH /opt/vlang/v RUN ln -s /opt/vlang/v /usr/bin/v && \ apk --no-cache add \ diff --git a/Makefile b/Makefile index aea3f6fc..4301d906 100644 --- a/Makefile +++ b/Makefile @@ -7,10 +7,11 @@ LARCHIVE_DIR := libarchive-$(LARCHIVE_VER) LARCHIVE_LIB := $(LARCHIVE_DIR)/libarchive/libarchive.so V_RELEASE := weekly.2022.04 +V_PATH ?= v-$(V_RELEASE)/v # Custom V command for linking libarchive # 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