diff options
| author | Clifford Wolf <clifford@clifford.at> | 2014-03-11 14:42:58 +0100 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2014-03-11 14:42:58 +0100 |
| commit | 7aa2d746b76a354daedd4c8a7b4d8c15b1805b21 (patch) | |
| tree | a806980a6713cea981166dd11493092ebc251aef | |
| parent | 91704a78531bec2e3eea3ddf90eaedb28e1d696d (diff) | |
| download | yosys-7aa2d746b76a354daedd4c8a7b4d8c15b1805b21.tar.gz yosys-7aa2d746b76a354daedd4c8a7b4d8c15b1805b21.tar.bz2 yosys-7aa2d746b76a354daedd4c8a7b4d8c15b1805b21.zip | |
Merged addition of SED makefile variable from github.com/Siesh1oo/yosys
(see https://github.com/cliffordwolf/yosys/pull/28)
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | techlibs/common/Makefile.inc | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -27,6 +27,7 @@ CXXFLAGS = -Wall -Wextra -ggdb -I"$(shell pwd)" -MD -D_YOSYS_ -fPIC LDFLAGS = -rdynamic LDLIBS = -lstdc++ -lreadline -lm -ldl -lrt QMAKE = qmake-qt4 +SED = sed YOSYS_VER := 0.2.0+ GIT_REV := $(shell git rev-parse --short HEAD || echo UNKOWN) @@ -115,7 +116,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 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 chmod +x yosys-config diff --git a/techlibs/common/Makefile.inc b/techlibs/common/Makefile.inc index 6d94d5c9b..c68b13f6c 100644 --- a/techlibs/common/Makefile.inc +++ b/techlibs/common/Makefile.inc @@ -2,7 +2,7 @@ EXTRA_TARGETS += techlibs/common/blackbox.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 EXTRA_TARGETS += share/simlib.v share/simcells.v share/blackbox.v share/pmux2mux.v |