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

- Makefile, techlibs/common/Makefile.inc: call GNU sed instead of BSD sed on OSX (for extended regular expressions).

This commit is contained in:
Siesh1oo 2014-03-10 15:07:37 +01:00
parent 8a0216bd9f
commit 63ca8d3fe4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -32,10 +32,12 @@ ifeq (Darwin,$(findstring Darwin,$(shell uname)))
CXXFLAGS += -I/opt/local/include CXXFLAGS += -I/opt/local/include
LDFLAGS += -L/opt/local/lib LDFLAGS += -L/opt/local/lib
QMAKE = qmake QMAKE = qmake
SED = gsed
else else
LDFLAGS += -rdynamic LDFLAGS += -rdynamic
LDLIBS += -lrt LDLIBS += -lrt
QMAKE = qmake-qt4 QMAKE = qmake-qt4
SED = sed
endif endif
YOSYS_VER := 0.2.0+ YOSYS_VER := 0.2.0+
@ -134,7 +136,7 @@ kernel/version_$(GIT_REV).cc: Makefile
echo "extern const char *yosys_version_str; const char *yosys_version_str=\"Yosys $(YOSYS_VER) (git sha1 $(GIT_REV))\";" > kernel/version_$(GIT_REV).cc echo "extern const char *yosys_version_str; const char *yosys_version_str=\"Yosys $(YOSYS_VER) (git sha1 $(GIT_REV))\";" > kernel/version_$(GIT_REV).cc
yosys-config: yosys-config.in yosys-config: yosys-config.in
sed -e 's,@CXX@,$(CXX),;' -e 's,@CXXFLAGS@,$(CXXFLAGS),;' -e 's,@LDFLAGS@,$(LDFLAGS),;' -e 's,@LDLIBS@,$(LDLIBS),;' \ $(SED) -e 's,@CXX@,$(CXX),;' -e 's,@CXXFLAGS@,$(CXXFLAGS),;' -e 's,@LDFLAGS@,$(LDFLAGS),;' -e 's,@LDLIBS@,$(LDLIBS),;' \
-e 's,@BINDIR@,$(DESTDIR)/bin,;' -e 's,@DATDIR@,$(DESTDIR)/share/yosys,;' < yosys-config.in > yosys-config -e 's,@BINDIR@,$(DESTDIR)/bin,;' -e 's,@DATDIR@,$(DESTDIR)/share/yosys,;' < yosys-config.in > yosys-config
chmod +x yosys-config chmod +x yosys-config
@ -144,7 +146,7 @@ yosys-svgviewer: libs/svgviewer/*.h libs/svgviewer/*.cpp
yosys-minisat: $(DESTDIR)/bin/minisat yosys-minisat: $(DESTDIR)/bin/minisat
$(DESTDIR)/bin/minisat: $(DESTDIR)/bin/minisat:
test -d minisat || ( git clone https://github.com/niklasso/minisat.git minisat && sed -i -e 's/PRIi64/ & /' minisat/minisat/utils/Options.h ) test -d minisat || ( git clone https://github.com/niklasso/minisat.git minisat && $(SED) -i -e 's/PRIi64/ & /' minisat/minisat/utils/Options.h )
( cd minisat && git checkout $(MINISATREV) ) ( cd minisat && git checkout $(MINISATREV) )
( cd minisat && $(MAKE) prefix=$(DESTDIR) DESTDIR="" config install ) ( cd minisat && $(MAKE) prefix=$(DESTDIR) DESTDIR="" config install )
@( cd minisat && echo "Installed minisat version `git describe --always --dirty` into $(DESTDIR)." ) @( cd minisat && echo "Installed minisat version `git describe --always --dirty` into $(DESTDIR)." )

2
techlibs/common/Makefile.inc
View File

@ -2,7 +2,7 @@
EXTRA_TARGETS += techlibs/common/blackbox.v EXTRA_TARGETS += techlibs/common/blackbox.v
techlibs/common/blackbox.v: techlibs/common/blackbox.sed techlibs/common/simlib.v techlibs/common/simcells.v techlibs/common/blackbox.v: techlibs/common/blackbox.sed techlibs/common/simlib.v techlibs/common/simcells.v
cat techlibs/common/simlib.v techlibs/common/simcells.v | sed -rf techlibs/common/blackbox.sed > techlibs/common/blackbox.v.new cat techlibs/common/simlib.v techlibs/common/simcells.v | $(SED) -rf techlibs/common/blackbox.sed > techlibs/common/blackbox.v.new
mv techlibs/common/blackbox.v.new techlibs/common/blackbox.v mv techlibs/common/blackbox.v.new techlibs/common/blackbox.v
EXTRA_TARGETS += share/simlib.v share/simcells.v share/blackbox.v share/pmux2mux.v EXTRA_TARGETS += share/simlib.v share/simcells.v share/blackbox.v share/pmux2mux.v