mirror of
https://github.com/ValveSoftware/Proton.git
synced 2025-01-28 06:28:20 +03:00
build: Don't force the number of make jobs.
This commit is contained in:
parent
ee04127950
commit
99f40d87e9
@ -52,7 +52,7 @@ else
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
DOCKER_BASE = docker run --rm -e HOME -e USER -e USERID=$(shell id -u) -u $(shell id -u):$(shell id -g) \
|
DOCKER_BASE = docker run --rm -e HOME -e USER -e USERID=$(shell id -u) -u $(shell id -u):$(shell id -g) \
|
||||||
-v $(HOME):$(HOME) -v $(SRC):$(SRC) -v $(OBJ):$(OBJ) -w $(OBJ) \
|
-v $(HOME):$(HOME) -v $(SRC):$(SRC) -v $(OBJ):$(OBJ) -w $(OBJ) -e MAKEFLAGS \
|
||||||
$(DOCKER_OPTS) $(STEAMRT_IMAGE)
|
$(DOCKER_OPTS) $(STEAMRT_IMAGE)
|
||||||
|
|
||||||
STEAMRT_NAME ?= soldier
|
STEAMRT_NAME ?= soldier
|
||||||
@ -63,8 +63,6 @@ TOOLMANIFEST_VDF_SRC := toolmanifest_noruntime.vdf
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(STEAMRT_IMAGE),)
|
ifneq ($(STEAMRT_IMAGE),)
|
||||||
SUBMAKE_JOBS ?= 36
|
|
||||||
MAKE := make -j$(SUBMAKE_JOBS)
|
|
||||||
CONTAINER_SHELL := $(DOCKER_BASE) /bin/bash
|
CONTAINER_SHELL := $(DOCKER_BASE) /bin/bash
|
||||||
STEAM_RUNTIME_RUNSH := $(DOCKER_BASE)
|
STEAM_RUNTIME_RUNSH := $(DOCKER_BASE)
|
||||||
else
|
else
|
||||||
@ -86,9 +84,10 @@ all32 $(MAKECMDGOALS64):
|
|||||||
.PHONY: all64 $(MAKECMDGOALS64)
|
.PHONY: all64 $(MAKECMDGOALS64)
|
||||||
|
|
||||||
ifeq ($(CONTAINER),)
|
ifeq ($(CONTAINER),)
|
||||||
|
J := $(shell nproc)
|
||||||
container-build: private SHELL := $(CONTAINER_SHELL)
|
container-build: private SHELL := $(CONTAINER_SHELL)
|
||||||
container-build:
|
container-build:
|
||||||
+$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(MFLAGS) $(MAKEOVERRIDES) CONTAINER=1 $(MAKECMDGOALS32) $(MAKECMDGOALS64)
|
+$(MAKE) -j$(J) $(filter -j%,$(MAKEFLAGS)) -f $(firstword $(MAKEFILE_LIST)) $(MFLAGS) $(MAKEOVERRIDES) CONTAINER=1 $(MAKECMDGOALS32) $(MAKECMDGOALS64)
|
||||||
.PHONY: container-build
|
.PHONY: container-build
|
||||||
|
|
||||||
all32 $(MAKECMDGOALS32): container-build
|
all32 $(MAKECMDGOALS32): container-build
|
||||||
|
Loading…
x
Reference in New Issue
Block a user