Revert "Improve ABC repository management in Makefile"

This reverts commit 90404e1969443a1b8a767ab8f3dc311709c5fe9d.

diff --git a/Makefile b/Makefile
index f7ebb71910c44ad7315f8fba7f7e0e6a5adec941..479cdf0e914e5040c7127031c86d66ca9149914f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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