projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: make building more strict, abort on errors in gccbuild phase
[project/luci.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
1b9e259
..
d082a98
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-12,7
+12,12
@@
all: build
build: gccbuild luabuild
gccbuild:
build: gccbuild luabuild
gccbuild:
- for i in $(MODULES); do make -C$$i compile; done
+ for i in $(MODULES); do \
+ make -C$$i compile || { \
+ echo "*** Compilation of $$i failed!"; \
+ exit 1; \
+ }; \
+ done
luabuild: i18nbuild
for i in $(MODULES); do HOST=$(realpath host) make -C$$i luabuild; done
luabuild: i18nbuild
for i in $(MODULES); do HOST=$(realpath host) make -C$$i luabuild; done
@@
-52,10
+57,11
@@
runboa: hostenv
runhttpd: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host/usr/bin/lucittpd) $(realpath host)/usr/lib/lucittpd/plugins"
runhttpd: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host/usr/bin/lucittpd) $(realpath host)/usr/lib/lucittpd/plugins"
-runluci: runhttpd
+runluci: luahost
+ build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath libs/httpd/host/runluci) $(realpath host) $(HTDOCS)"
runlua: hostenv
runlua: hostenv
- build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR)
lua
+ build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR)
"lua -i build/setup.lua"
runshell: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) $$SHELL
runshell: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) $$SHELL