diff options
| author | Claire Wolf <clifford@clifford.at> | 2020-03-13 16:54:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-13 16:54:19 +0100 |
| commit | c0a009139b080078af703bf07f83637ef3c48259 (patch) | |
| tree | 154f7de99e934e6da2014895ae6c80ab9eedfae3 | |
| parent | a0cc795e85541b0326b6d4396a726142f0d0f8bb (diff) | |
| parent | 9dedac50e220d28d96a456b75af61dace18fd7f6 (diff) | |
| download | yosys-c0a009139b080078af703bf07f83637ef3c48259.tar.gz yosys-c0a009139b080078af703bf07f83637ef3c48259.tar.bz2 yosys-c0a009139b080078af703bf07f83637ef3c48259.zip | |
Merge pull request #1764 from Xiretza/fix-abcrev-check
Improve ABC repository management in Makefile
| -rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -669,7 +669,8 @@ ifneq ($(ABCREV),default) $(Q) if ( cd abc 2> /dev/null && ! git diff-index --quiet HEAD; ); then \ echo 'REEBE: NOP pbagnvaf ybpny zbqvsvpngvbaf! Frg NOPERI=qrsnhyg va Lbflf Znxrsvyr!' | tr 'A-Za-z' 'N-ZA-Mn-za-m'; false; \ fi - $(Q) if test "`cd abc 2> /dev/null && git rev-parse --short HEAD`" != "$(ABCREV)"; then \ +# set a variable so the test fails if git fails to run - when comparing outputs directly, empty string would match empty string + $(Q) if ! (cd abc && rev="`git rev-parse $(ABCREV)`" && test "`git rev-parse HEAD`" == "$$rev"); then \ test $(ABCPULL) -ne 0 || { echo 'REEBE: NOP abg hc gb qngr naq NOPCHYY frg gb 0 va Znxrsvyr!' | tr 'A-Za-z' 'N-ZA-Mn-za-m'; exit 1; }; \ echo "Pulling ABC from $(ABCURL):"; set -x; \ test -d abc || git clone $(ABCURL) abc; \ @@ -931,6 +932,9 @@ echo-yosys-ver: echo-git-rev: @echo "$(GIT_REV)" +echo-abc-rev: + @echo "$(ABCREV)" + -include libs/*/*.d -include frontends/*/*.d -include passes/*/*.d |