Skip to content

Commit a3b4c4d

Browse files
committed
Fix yosys static build.
1 parent d08113f commit a3b4c4d

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

src/Makefile

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ docker_package:
8282
docker run --user $(REPO_OWNER) -v `pwd`/..:/vossroot vossii-static-builder
8383

8484
package: clean yosys_clean
85-
make install LINKFLAG=-static
85+
make install LINKFLAG=-static YOSYS_LDLIBS="-lreadline -ltinfo"
8686
rm -r ../voss ; true
8787
install -m 755 -d ../voss/
8888
install -m 755 -d ../voss/bin
@@ -91,15 +91,14 @@ package: clean yosys_clean
9191
install -m 755 -d ../voss/modes/emacs
9292
install -m 755 -d ../voss/modes/vim
9393

94-
install -m 755 -s -t ../voss/bin
95-
install -m 755 -s -t ../voss/bin ../bin/fl
96-
install -m 755 -s -t ../voss/bin ../bin/functor
97-
install -m 755 -s -t ../voss/bin ../bin/yosys
98-
install -m 755 -t ../voss/bin ../bin/front_end.tcl
99-
install -m 644 -t ../voss/bin ../bin/prefs.tcl
100-
install -m 644 -t ../voss/bin ../bin/utils.tcl
101-
install -m 644 -t ../voss/bin ../bin/builtins.fl
102-
install -m 644 -t ../voss/bin ../bin/preamble.fl
94+
install -m 755 -t ../voss/bin ../bin/fl
95+
install -m 755 -t ../voss/bin ../bin/functor
96+
install -m 755 -t ../voss/bin ../bin/yosys
97+
install -m 755 -t ../voss/bin ../bin/front_end.tcl
98+
install -m 644 -t ../voss/bin ../bin/prefs.tcl
99+
install -m 644 -t ../voss/bin ../bin/utils.tcl
100+
install -m 644 -t ../voss/bin ../bin/builtins.fl
101+
install -m 644 -t ../voss/bin ../bin/preamble.fl
103102

104103
install -m 644 -t ../voss/modes/emacs ../modes/emacs/fl-mode.el
105104
install -m 644 -t ../voss/modes/emacs ../modes/emacs/README.md

src/external/yosys/Makefile_Voss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,12 @@ VPATH := $(YOSYS_SRC)
7575

7676
CXXFLAGS := $(CXXFLAGS) -Wall -Wextra -ggdb -I. -I"$(YOSYS_SRC)" -MD -D_YOSYS_ -fPIC -I$(PREFIX)/include
7777
LDFLAGS := $(LDFLAGS) -L$(LIBDIR)
78-
LDLIBS := $(LDLIBS) -lstdc++ -lm
78+
79+
# !!!IMPORTANT!!!
80+
# DO NOT REMOVE READLINE AND TINFO, OR YOU'LL BREAK THE STATIC BUILD!
81+
LDLIBS := $(LDLIBS) -lstdc++ -lm -lreadline -ltinfo
82+
83+
7984
PLUGIN_LDFLAGS :=
8085

8186
PKG_CONFIG ?= pkg-config

0 commit comments

Comments
 (0)