lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-07-29 11:21:22 +03:00
Code Activity

Merge pull request #3247 from haampie/fix/grep

Browse Source 
Fix make variable
This commit is contained in:
Yann Collet
2022-09-19 10:47:38 -07:00
committed by GitHub
parent ad13c4aec9 efef80b75e
commit f7251f88b9
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -157,7 +157,7 @@ MKDIR ?= mkdir -p
HAVE_COLORNEVER = $(shell echo a | egrep --color=never a > /dev/null 2> /dev/null && echo 1 || echo 0) HAVE_COLORNEVER = $(shell echo a | egrep --color=never a > /dev/null 2> /dev/null && echo 1 || echo 0)
EGREP_OPTIONS ?= EGREP_OPTIONS ?=
ifeq ($HAVE_COLORNEVER, 1) ifeq ($(HAVE_COLORNEVER), 1)
EGREP_OPTIONS += --color=never EGREP_OPTIONS += --color=never
endif endif
EGREP = egrep $(EGREP_OPTIONS) EGREP = egrep $(EGREP_OPTIONS)

2
lib/libzstd.mk
View File

@ -120,7 +120,7 @@ endif
HAVE_COLORNEVER = $(shell echo a | grep --color=never a > /dev/null 2> /dev/null && echo 1 || echo 0) HAVE_COLORNEVER = $(shell echo a | grep --color=never a > /dev/null 2> /dev/null && echo 1 || echo 0)
GREP_OPTIONS ?= GREP_OPTIONS ?=
ifeq ($HAVE_COLORNEVER, 1) ifeq ($(HAVE_COLORNEVER), 1)
GREP_OPTIONS += --color=never GREP_OPTIONS += --color=never
endif endif
GREP = grep $(GREP_OPTIONS) GREP = grep $(GREP_OPTIONS)

2
programs/Makefile
View File

@ -343,7 +343,7 @@ ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD D
HAVE_COLORNEVER = $(shell echo a | egrep --color=never a > /dev/null 2> /dev/null && echo 1 || echo 0) HAVE_COLORNEVER = $(shell echo a | egrep --color=never a > /dev/null 2> /dev/null && echo 1 || echo 0)
EGREP_OPTIONS ?= EGREP_OPTIONS ?=
ifeq ($HAVE_COLORNEVER, 1) ifeq ($(HAVE_COLORNEVER), 1)
EGREP_OPTIONS += --color=never EGREP_OPTIONS += --color=never
endif endif
EGREP = egrep $(EGREP_OPTIONS) EGREP = egrep $(EGREP_OPTIONS)