public
/
toolchain
5
0
Fork 0
Code Issues 5 Pull Requests 1 Packages Projects Releases Wiki Activity

more default vars

This commit is contained in:
Lance Vick 2023-09-03 02:46:55 -07:00
parent d3f66385c2
commit 9ddcbe18e5
Signed by: lrvick
GPG Key ID: 8E47A1EC35A1551D
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -3,7 +3,6 @@ altarch = $(subst x86_64,amd64,$(subst aarch64,arm64,$1))
TOOLCHAIN_VOLUME := $(PWD):/home/build TOOLCHAIN_VOLUME := $(PWD):/home/build
TOOLCHAIN_WORKDIR := /home/build TOOLCHAIN_WORKDIR := /home/build
DEFAULT_GOAL := $(or $(DEFAULT_GOAL),toolchain) DEFAULT_GOAL := $(or $(DEFAULT_GOAL),toolchain)
ARCH := $(or $(ARCH),x86_64) ARCH := $(or $(ARCH),x86_64)
TARGET := $(or $(TARGET),$(ARCH)) TARGET := $(or $(TARGET),$(ARCH))
@ -20,6 +19,7 @@ UID := $(shell id -u)
GID := $(shell id -g) GID := $(shell id -g)
USER := $(UID):$(GID) USER := $(UID):$(GID)
CPUS := $(shell docker run debian nproc) CPUS := $(shell docker run debian nproc)
ARCHIVE_SOURCES := true
PRESERVE_CACHE := "false" PRESERVE_CACHE := "false"
GIT_REF := $(shell git log -1 --format=%H) GIT_REF := $(shell git log -1 --format=%H)
GIT_AUTHOR := $(shell git log -1 --format=%an) GIT_AUTHOR := $(shell git log -1 --format=%an)
@ -47,6 +47,10 @@ KEY_DIR := fetch/keys
OUT_DIR := out OUT_DIR := out
docker = docker docker = docker
PATH_PREFIX := /home/build/$(CACHE_DIR)/bin:/home/build/$(OUT_DIR)/linux/x86_64
PREFIX := $(HOME)/.local/bin
XDG_CONFIG_HOME := $(HOME)/.config
export export
include $(CONFIG_DIR)/make.env include $(CONFIG_DIR)/make.env
@ -113,7 +117,7 @@ $(FETCH_DIR)/apt/Packages.bz2: $(CONFIG_DIR)/apt-hashes-x86_64.list
--platform=linux/$(ARCH) \ --platform=linux/$(ARCH) \
--env LOCAL_USER=$(UID):$(GID) \ --env LOCAL_USER=$(UID):$(GID) \
--env FETCH_DIR="$(FETCH_DIR)" \ --env FETCH_DIR="$(FETCH_DIR)" \
--env PACKAGES_LATEST=$(PACKAGES_LATEST) \ --env ARCHIVE_SOURCES=$(ARCHIVE_SOURCES) \
--volume $(PWD)/$(CONFIG_DIR):/config \ --volume $(PWD)/$(CONFIG_DIR):/config \
--volume $(PWD)/$(SRC_DIR)/toolchain/scripts:/usr/local/bin \ --volume $(PWD)/$(SRC_DIR)/toolchain/scripts:/usr/local/bin \
--volume $(PWD)/$(FETCH_DIR):/fetch \ --volume $(PWD)/$(FETCH_DIR):/fetch \