From: Siesh1oo <siesh1oo@siesh1oo.no>
Date: Mon, 10 Mar 2014 14:07:37 +0000 (+0100)
Subject:  - Makefile, techlibs/common/Makefile.inc: call GNU sed instead of BSD sed on OSX... 
X-Git-Tag: yosys-0.3.0~57^2~1^2~6^2~1^2~6
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=63ca8d3fe4273d9e07233f94037a63659d6d18e4;p=yosys.git

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

diff --git a/Makefile b/Makefile
index c0d43a2c3..7bd8a450e 100644
--- a/Makefile
+++ b/Makefile
@@ -32,10 +32,12 @@ ifeq (Darwin,$(findstring Darwin,$(shell uname)))
 	CXXFLAGS += -I/opt/local/include
 	LDFLAGS += -L/opt/local/lib
 	QMAKE = qmake
+	SED = gsed
 else
 	LDFLAGS += -rdynamic
 	LDLIBS += -lrt
 	QMAKE = qmake-qt4
+	SED = sed
 endif
 
 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
 
 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
 
@@ -144,7 +146,7 @@ yosys-svgviewer: libs/svgviewer/*.h libs/svgviewer/*.cpp
 
 yosys-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 && $(MAKE) prefix=$(DESTDIR) DESTDIR="" config install )
 	@( cd minisat && echo "Installed minisat version `git describe --always --dirty` into $(DESTDIR)." )
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