mirror of https://github.com/YosysHQ/yosys.git
- Makefile: export PATH=${DESTDIR}/bin:$(PATH) and (DY)LD_LIBRARY_PATH, to make sure our local copies of built executables and libraries are used.
- Makefile: use find expression in target 'yosys-svgviewer' to find svgviewer binary (qmake will build into .app package on OSX). - Makefile: make 'test' target dependent on $(TARGETS) and $(EXTRA_TARGETS) to make sure that minisat is built.
This commit is contained in:
parent
26895223a1
commit
1d0abb3ad2
4
Makefile
4
Makefile
|
@ -26,13 +26,17 @@ CXXFLAGS = -Wall -Wextra -ggdb -I"$(shell pwd)" -I${DESTDIR}/include -MD -D_YOSY
|
||||||
LDFLAGS = -L${DESTDIR}/lib
|
LDFLAGS = -L${DESTDIR}/lib
|
||||||
LDLIBS = -lstdc++ -lreadline -lm -ldl
|
LDLIBS = -lstdc++ -lreadline -lm -ldl
|
||||||
|
|
||||||
|
export PATH := ${DESTDIR}/bin:$(PATH)
|
||||||
|
|
||||||
ifeq (Darwin,$(findstring Darwin,$(shell uname)))
|
ifeq (Darwin,$(findstring Darwin,$(shell uname)))
|
||||||
# add macports include and library path to search directories, don't use '-rdynamic' and '-lrt':
|
# add macports include and library path to search directories, don't use '-rdynamic' and '-lrt':
|
||||||
|
export DYLD_LIBRARY_PATH := ${DESTDIR}/lib:$(DYLD_LIBRARY_PATH)
|
||||||
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
|
SED = gsed
|
||||||
else
|
else
|
||||||
|
export LD_LIBRARY_PATH := ${DESTDIR}/lib:$(LD_LIBRARY_PATH)
|
||||||
LDFLAGS += -rdynamic
|
LDFLAGS += -rdynamic
|
||||||
LDLIBS += -lrt
|
LDLIBS += -lrt
|
||||||
QMAKE = qmake-qt4
|
QMAKE = qmake-qt4
|
||||||
|
|
Loading…
Reference in New Issue