Commit e6b68db6 authored by Ben Avison's avatar Ben Avison
Browse files

Fix for cross-compilation of components with TARGET or INSTDIR undefined in ModuleDB

In cases where mk's environment didn't define these, the null definition from
ModuleDB was overriding any default definitions in the Makefile, which is very
unhelpful!
parent 09cc90ae
......@@ -126,10 +126,10 @@ mk ()
if [ -z "$COMPONENT" ]; then
ARGS="$ARGS COMPONENT=$DB_COMPONENT"
fi
if [ -z "$TARGET" ]; then
if [ -z "$TARGET" ] && [ -n "$DB_TARGET" ]; then
ARGS="$ARGS TARGET=$DB_TARGET"
fi
if [ -z "$INSTDIR" ]; then
if [ -z "$INSTDIR" ] && [ -n "$DB_INSTDIR" ]; then
ARGS="$ARGS INSTDIR=$INSTALLDIR/$DB_INSTDIR"
fi
make -C $COMPONENTDIR $ARGS $@
......
Markdown is supported
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