go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2637 from avagin:make-vs-bazel 

PiperOrigin-RevId: 310479788
This commit is contained in:
gVisor bot 2020-05-07 19:04:19 -07:00
parent 5536073969 5d54ddcf03
commit c59e7b832c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/bazel.mk
View File

@ -34,6 +34,7 @@ FULL_DOCKER_RUN_OPTIONS := $(DOCKER_RUN_OPTIONS)
FULL_DOCKER_RUN_OPTIONS += -v "$(BAZEL_CACHE):$(BAZEL_CACHE)" FULL_DOCKER_RUN_OPTIONS += -v "$(BAZEL_CACHE):$(BAZEL_CACHE)"
FULL_DOCKER_RUN_OPTIONS += -v "$(GCLOUD_CONFIG):$(GCLOUD_CONFIG)" FULL_DOCKER_RUN_OPTIONS += -v "$(GCLOUD_CONFIG):$(GCLOUD_CONFIG)"
FULL_DOCKER_RUN_OPTIONS += -v "$(DOCKER_SOCKET):$(DOCKER_SOCKET)" FULL_DOCKER_RUN_OPTIONS += -v "$(DOCKER_SOCKET):$(DOCKER_SOCKET)"
SHELL=/bin/bash -o pipefail
## ##
## Bazel helpers. ## Bazel helpers.
@ -78,7 +79,7 @@ bazel-server: ## Ensures that the server exists. Used as an internal target.
@docker exec $(DOCKER_NAME) true || $(MAKE) bazel-server-start @docker exec $(DOCKER_NAME) true || $(MAKE) bazel-server-start
.PHONY: bazel-server .PHONY: bazel-server
build_paths = docker exec --user $(UID):$(GID) -i $(DOCKER_NAME) sh -c 'bazel build $(OPTIONS) $(TARGETS) 2>&1 \ build_paths = docker exec --user $(UID):$(GID) -i $(DOCKER_NAME) sh -o pipefail -c 'bazel build $(OPTIONS) $(TARGETS) 2>&1 \
| tee /dev/fd/2 \ | tee /dev/fd/2 \
| grep -E "^ bazel-bin/" \ | grep -E "^ bazel-bin/" \
| awk "{print $$1;}"' \ | awk "{print $$1;}"' \