diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2020-03-12 18:26:07 +0100 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2020-03-12 18:26:07 +0100 |
| commit | 178a8e3bffbb76e86ac8fdab7ece590dd9fd4bc4 (patch) | |
| tree | 5de01f04bcb61b3061c4b183cd43ac11fa7e2078 | |
| parent | af84e5acf167ffe9373e99d1709dd28928f060fb (diff) | |
| download | yosys-178a8e3bffbb76e86ac8fdab7ece590dd9fd4bc4.tar.gz yosys-178a8e3bffbb76e86ac8fdab7ece590dd9fd4bc4.tar.bz2 yosys-178a8e3bffbb76e86ac8fdab7ece590dd9fd4bc4.zip | |
Revert "Improve ABC repository management in Makefile"
This reverts commit 90404e1969443a1b8a767ab8f3dc311709c5fe9d.
| -rw-r--r-- | Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -669,8 +669,7 @@ 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 - # 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 \ + $(Q) if test "`cd abc 2> /dev/null && git rev-parse --short HEAD`" != "$(ABCREV)"; 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; \ @@ -929,9 +928,6 @@ echo-yosys-ver: echo-git-rev: @echo "$(GIT_REV)" -echo-abc-rev: - @echo "$(ABCREV)" - -include libs/*/*.d -include frontends/*/*.d -include passes/*/*.d |