Fix build for new ABC location on github, also update ABC to a2d59be

diff --git a/Makefile b/Makefile
index af29ff414b9a46a6a509dfac453642e192876096..0b8af9f8fdd3b44783da29f7c0b8d69d68df4576 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -102,9 +102,9 @@ OBJS = kernel/version_$(GIT_REV).o
 # is just a symlink to your actual ABC working directory, as 'make mrproper'
 # will remove the 'abc' directory and you do not want to accidentally
 # delete your work on ABC..
-ABCREV = 6e3c24b3308a
+ABCREV = a2d59be
 ABCPULL = 1
-ABCURL ?= https://bitbucket.org/alanmi/abc
+ABCURL ?= https://github.com/berkeley-abc/abc
 ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1
 
 # set ABCEXTERNAL = <abc-command> to use an external ABC instance
@@ -442,14 +442,14 @@ yosys-config: misc/yosys-config.in
 abc/abc-$(ABCREV)$(EXE):
        $(P)
 ifneq ($(ABCREV),default)
-       $(Q) if ( cd abc 2> /dev/null && hg identify; ) | grep -q +; then \
+       $(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 && hg identify | cut -f1 -d' '`" != "$(ABCREV)"; 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 || hg clone --insecure $(ABCURL) abc; \
-               cd abc && $(MAKE) DEP= clean && hg pull --insecure && hg update -r $(ABCREV); \
+               test -d abc || git clone $(ABCURL) abc; \
+               cd abc && $(MAKE) DEP= clean && git fetch origin master && git checkout $(ABCREV); \
        fi
 endif
        $(Q) rm -f abc/abc-[0-9a-f]*