aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2018-12-16 16:31:37 +0100
committerGitHub <noreply@github.com>2018-12-16 16:31:37 +0100
commit4c5173045bb4e8d6f00d9ba5269bf30e6c10d6f6 (patch)
tree2c9f2653521ec1c12c004af3d52b279ca8ab1fe3
parentac27a5a7372b021f4d7ab848911fad7725c75ce7 (diff)
parentc472467be912aad65a0e49364dd5a9a6402291b1 (diff)
downloadyosys-4c5173045bb4e8d6f00d9ba5269bf30e6c10d6f6.tar.gz
yosys-4c5173045bb4e8d6f00d9ba5269bf30e6c10d6f6.tar.bz2
yosys-4c5173045bb4e8d6f00d9ba5269bf30e6c10d6f6.zip
Merge pull request #704 from webhat/feature/fix-awk
Using awk rather than gawk
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8da6315fb..128539f6a 100644
--- a/Makefile
+++ b/Makefile
@@ -72,6 +72,7 @@ PKG_CONFIG ?= pkg-config
SED ?= sed
BISON ?= bison
STRIP ?= strip
+AWK ?= awk
ifeq ($(OS), Darwin)
PLUGIN_LDFLAGS += -undefined dynamic_lookup
@@ -395,8 +396,8 @@ endef
ifeq ($(PRETTY), 1)
P_STATUS = 0
P_OFFSET = 0
-P_UPDATE = $(eval P_STATUS=$(shell echo $(OBJS) yosys$(EXE) | gawk 'BEGIN { RS = " "; I = $(P_STATUS)+0; } $$1 == "$@" && NR > I { I = NR; } END { print I; }'))
-P_SHOW = [$(shell gawk "BEGIN { N=$(words $(OBJS) yosys$(EXE)); printf \"%3d\", $(P_OFFSET)+90*$(P_STATUS)/N; exit; }")%]
+P_UPDATE = $(eval P_STATUS=$(shell echo $(OBJS) yosys$(EXE) | $(AWK) 'BEGIN { RS = " "; I = $(P_STATUS)+0; } $$1 == "$@" && NR > I { I = NR; } END { print I; }'))
+P_SHOW = [$(shell $(AWK) "BEGIN { N=$(words $(OBJS) yosys$(EXE)); printf \"%3d\", $(P_OFFSET)+90*$(P_STATUS)/N; exit; }")%]
P = @echo "$(if $(findstring $@,$(TARGETS) $(EXTRA_TARGETS)),$(eval P_OFFSET = 10))$(call P_UPDATE)$(call P_SHOW) Building $@";
Q = @
S = -s