From: Clifford Wolf <clifford@clifford.at>
Date: Sat, 11 Oct 2014 09:44:36 +0000 (+0200)
Subject: Fixed Makefile PRETTY=1 for MXE (win32) and EMCC (js) builds
X-Git-Tag: yosys-0.4~65
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=217c7c7b8d1f46ed0b4d8b8a4fbe1b10c0157a6a;p=yosys.git

Fixed Makefile PRETTY=1 for MXE (win32) and EMCC (js) builds
---

diff --git a/Makefile b/Makefile
index 8a4ff52e8..46ac373fb 100644
--- a/Makefile
+++ b/Makefile
@@ -139,8 +139,8 @@ endif
 ifeq ($(PRETTY), 1)
 P_STATUS = 0
 P_OFFSET = 0
-P_UPDATE = $(eval P_STATUS=$(shell echo $(OBJS) yosys | gawk 'BEGIN { RS = " "; I = $(P_STATUS)+0; } $$1 == "$@" && NR > I { I = NR; } END { print I; }'))
-P_SHOW = [$(shell gawk "BEGIN { N=$(words $(OBJS) yosys); printf \"%3d\", $(P_OFFSET)+90*$(P_STATUS)/N; exit; }")%]
+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 = @echo "$(if $(findstring $@,$(TARGETS) $(EXTRA_TARGETS)),$(eval P_OFFSET = 10))$(call P_UPDATE)$(call P_SHOW) Building $@";
 Q = @
 S = -s