From 8b0ec3c3a24108d7d3bf42e05effd561d10a918b Mon Sep 17 00:00:00 2001 From: Xiretza Date: Sat, 30 May 2020 11:21:40 +0200 Subject: [PATCH] Use in-tree include directory in manual build This is basically the same issue as in tests/various/plugin.sh, which uses yosys-config to compile a plugin. `yosys-config --cxxflags` points to `$PREFIX/share/` (/usr/local/share by default), which might not exist yet or might be out of date. Building directly from the headers in ./share/ avoids this. --- manual/PRESENTATION_Prog/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/manual/PRESENTATION_Prog/Makefile b/manual/PRESENTATION_Prog/Makefile index 794f5c12c..7e3cf814b 100644 --- a/manual/PRESENTATION_Prog/Makefile +++ b/manual/PRESENTATION_Prog/Makefile @@ -1,8 +1,11 @@ all: test0.log test1.log test2.log +CXXFLAGS=$(shell ../../yosys-config --cxxflags) +DATDIR=$(shell ../../yosys-config --datdir) + my_cmd.so: my_cmd.cc - ../../yosys-config --exec --cxx --cxxflags --ldflags -o my_cmd.so -shared my_cmd.cc --ldlibs + ../../yosys-config --exec --cxx $(subst $(DATDIR),../../share,$(CXXFLAGS)) --ldflags -o my_cmd.so -shared my_cmd.cc --ldlibs test0.log: my_cmd.so ../../yosys -Ql test0.log_new -m ./my_cmd.so -p 'my_cmd foo bar' absval_ref.v -- 2.30.2