riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Clifford Wolf 2018-03-27 00:39:01 +02:00
parent 491c352da7
commit 6f681c4f82
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -102,9 +102,9 @@ OBJS = kernel/version_$(GIT_REV).o
# is just a symlink to your actual ABC working directory, as 'make mrproper' # 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 # will remove the 'abc' directory and you do not want to accidentally
# delete your work on ABC.. # delete your work on ABC..
ABCREV = 6e3c24b3308a ABCREV = a2d59be
ABCPULL = 1 ABCPULL = 1
ABCURL ?= https://bitbucket.org/alanmi/abc ABCURL ?= https://github.com/berkeley-abc/abc
ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1
# set ABCEXTERNAL = <abc-command> to use an external ABC instance # set ABCEXTERNAL = <abc-command> to use an external ABC instance
@ -442,14 +442,14 @@ yosys-config: misc/yosys-config.in
abc/abc-$(ABCREV)$(EXE): abc/abc-$(ABCREV)$(EXE):
$(P) $(P)
ifneq ($(ABCREV),default) 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; \ echo 'REEBE: NOP pbagnvaf ybpny zbqvsvpngvbaf! Frg NOPERI=qrsnhyg va Lbflf Znxrsvyr!' | tr 'A-Za-z' 'N-ZA-Mn-za-m'; false; \
fi 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; }; \ 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; \ echo "Pulling ABC from $(ABCURL):"; set -x; \
test -d abc || hg clone --insecure $(ABCURL) abc; \ test -d abc || git clone $(ABCURL) abc; \
cd abc && $(MAKE) DEP= clean && hg pull --insecure && hg update -r $(ABCREV); \ cd abc && $(MAKE) DEP= clean && git fetch origin master && git checkout $(ABCREV); \
fi fi
endif endif
$(Q) rm -f abc/abc-[0-9a-f]* $(Q) rm -f abc/abc-[0-9a-f]*