Skip to content

Commit

Permalink
makefile: ensure that libdir is created
Browse files Browse the repository at this point in the history
travis ci seems to sometimes fail because the lib
directory is not created and files can't be copied.

Suspect that this is due 'make -j$(nproc)'

Reviewed makefile and added '$(libdir)' dependencies

(cherry picked from commit 9355451)
  • Loading branch information
jayrm committed Jan 7, 2024
1 parent 4be3b8e commit b792536
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions makefile
Expand Up @@ -802,16 +802,16 @@ $(libdir)/fbrt0pic.o: $(srcdir)/rtlib/static/fbrt0.c $(LIBFB_H) | $(libdir)
$(QUIET_CC)$(CC) -fPIC $(ALLCFLAGS) -c $< -o $@

$(libdir)/libfb.a: $(LIBFB_C) $(LIBFB_S) | $(libdir)
$(libdir)/termlib_min.js: $(rootdir)lib/termlib_min.js
$(libdir)/termlib_min.js: $(rootdir)lib/termlib_min.js | $(libdir)
cp $< $@

$(libdir)/fb_rtlib.js: $(rootdir)lib/fb_rtlib.js
$(libdir)/fb_rtlib.js: $(rootdir)lib/fb_rtlib.js | $(libdir)
cp $< $@

$(libdir)/fb_shell.html: $(rootdir)lib/fb_shell.html
$(libdir)/fb_shell.html: $(rootdir)lib/fb_shell.html | $(libdir)
cp $< $@

$(libdir)/libfb.a: $(LIBFB_C) $(LIBFB_S)
$(libdir)/libfb.a: $(LIBFB_C) $(LIBFB_S) | $(libdir)
ifeq ($(TARGET_OS),dos)
# Avoid hitting the command line length limit (the libfb.a ar command line
# is very long...)
Expand Down Expand Up @@ -876,7 +876,7 @@ endif
.PHONY: fbrt
fbrt: $(RTL_LIBS) $(FBRTL_LIBS)

$(libdir)/libfbrt.a: $(LIBFBRT_BAS) $(LIBFBRT_S) $(LIBFBRT_C)
$(libdir)/libfbrt.a: $(LIBFBRT_BAS) $(LIBFBRT_S) $(LIBFBRT_C) | $(libdir)
ifeq ($(TARGET_OS),dos)
# Avoid hitting the command line length limit (the libfbrt.a ar command line
# is very long...)
Expand Down

0 comments on commit b792536

Please sign in to comment.