Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12443 from cfc4n/makefile_xargs_r

Browse Source 
Makefile: -r is only necessary on GNU xargs.
This commit is contained in:
Gyuho Lee 2020-11-02 10:51:09 -08:00 committed by GitHub
commit 86185ba20f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -10,6 +10,15 @@
# make docker-kill # make docker-kill
# make docker-remove # make docker-remove
UNAME := $(shell uname)
XARGS = xargs
# -r is only necessary on GNU xargs.
ifeq ($(UNAME), Linux)
XARGS += -r
endif
XARGS += rm -r
.PHONY: build .PHONY: build
build: build:
GO_BUILD_FLAGS="-v" ./build GO_BUILD_FLAGS="-v" ./build
@ -26,7 +35,7 @@ clean:
rm -rf ./release rm -rf ./release
rm -rf ./coverage/*.err ./coverage/*.out rm -rf ./coverage/*.err ./coverage/*.out
rm -rf ./tests/e2e/default.proxy rm -rf ./tests/e2e/default.proxy
find ./ -name "127.0.0.1:*" -o -name "localhost:*" -o -name "*.log" -o -name "agent-*" -o -name "*.coverprofile" -o -name "testname-proxy-*" | xargs -r rm -r find ./ -name "127.0.0.1:*" -o -name "localhost:*" -o -name "*.log" -o -name "agent-*" -o -name "*.coverprofile" -o -name "testname-proxy-*" | $(XARGS)
docker-clean: docker-clean:
docker images docker images