diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-03-27 00:39:01 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-03-27 00:39:01 +0200 |
| commit | 6f681c4f8296d5776d7773c2f7eb62398bf11507 (patch) | |
| tree | 7787daa030859c768d2340d6239fe4c819ccced4 | |
| parent | 491c352da7b656aa3979754e0a03182dfaabdd13 (diff) | |
| download | yosys-6f681c4f8296d5776d7773c2f7eb62398bf11507.tar.gz yosys-6f681c4f8296d5776d7773c2f7eb62398bf11507.tar.bz2 yosys-6f681c4f8296d5776d7773c2f7eb62398bf11507.zip | |
Fix build for new ABC location on github, also update ABC to a2d59be
| -rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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]* |