Commit 1b4b001c authored by Jeroen Vreeken's avatar Jeroen Vreeken
Browse files

A few cross compile issues

mod_websocket_dt and libnova now correctly build
parent e3b80911
......@@ -18,6 +18,9 @@ help:
echo " release Build both controller and console release"; \
echo " clean Clean for both controller and console"; \
echo ""; \
echo " HOST=<prefix> Cross compile for <prefix>.";\
echo " e.g.: HOST=arm-linux-gnueabihf"; \
echo ""; \
echo "Building a release"; \
echo "------------------"; \
echo "Simply running \"make release\" will build both the console and"; \
......@@ -29,12 +32,12 @@ help:
echo "golden repository (on eris.camras.nl)."
libnova.la:
cd libnova-0.13.0 ; ./configure -enable-static -disable-shared --prefix=${CURDIR} ; make; make install
libnova.la: lib/libnova.la
lib/libnova.la:
cd libnova-0.13.0 ; ./configure -enable-static -disable-shared --prefix=${CURDIR} $(CONF_HOST); make; make install
clean: subdirs_CLEAN
rm -rf common/lib/*
rm -rf lib/*
cd libnova-0.13.0 ; make clean || true
# Rules for building a release
......@@ -76,7 +79,7 @@ rel_ctrl: rel_trace rel_log rel_command
rel_libnova: rel_clone_dir
@echo "****** Building libnova"; \
(cd $(REL_BUILD_DIR)/libnova-0.13.0 ; ./configure -enable-static -disable-shared --prefix=$(REL_BUILD_DIR); make; make install) >/dev/null; \
(cd $(REL_BUILD_DIR)/libnova-0.13.0 ; ./configure -enable-static -disable-shared --prefix=$(REL_BUILD_DIR) $(CONF_HOST); make; make install) >/dev/null; \
echo " Done"
......
......@@ -15,9 +15,10 @@ else
FLEX=/usr/local/bin/flex
endif
ifdef TARGET
CC=${TARGET}-gcc
LIBTOOL=${TARGET}-libtool
ifdef HOST
CC=${HOST}-gcc
LIBTOOL=${HOST}-libtool
CONF_HOST=--host=${HOST}
endif
......@@ -54,7 +55,7 @@ endef
%.so:
@echo "LT soLD $@"
@${LIBTOOL} --quiet --mode=link gcc $(filter %.lo,$^) -o $@ $(LDFLAGS) $($@_LDFLAGS)
@${LIBTOOL} --quiet --mode=link --tag=CC $(CC) $(filter %.lo,$^) -o $@ $(LDFLAGS) $($@_LDFLAGS)
(%): %
@echo " AR $^ in $@"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment