Fix the --host parameter to build to include "elf" where appropriate

i.e. now i386-rumprun-netbsdelf, not just -netbsd

app-tools/Makefile.app-tools

@@ -1,4 +1,4 @@
-_APPTOOLS_PARAMS=  APP_TOOLS_TARGETARCH APP_TOOLS_PLATFORM APP_TOOLS_DIR
+_APPTOOLS_PARAMS=  APP_TOOLS_GNUPLATFORM APP_TOOLS_PLATFORM APP_TOOLS_DIR
 _APPTOOLS_PARAMS+= APP_TOOLS_HEADOBJ APP_TOOLS_LDSCRIPT
 
 define varchk_tmpl
@@ -37,7 +37,8 @@ $(APP_TOOLS_DIR)/rumprun-$(APP_TOOLS_PLATFORM)-${1}: \
 	sed <$$< >$$@.tmp \
 		-e 's#!CC!#$(CC)#g;' \
 		-e 's#!CXX!#$(CXX)#g;' \
-		-e 's#!ARCH!#$(APP_TOOLS_TARGETARCH)#g;' \
+		-e 's#!GNUPLATFORM!#$(subst \
+		    --,-rumprun-,${APP_TOOLS_GNUPLATFORM})#g;' \
 		-e 's#!BASE!#$(abspath ../..)#g;' \
 		-e 's#!APPTOOLS!#$(APP_TOOLS_DIR)#g;' \
 		-e 's#!APPTOOLS_PLATFORM!#$(APP_TOOLS_PLATFORM)#g;' \

app-tools/configure.in

@@ -6,4 +6,4 @@ prog=$1; shift
 export CC=!APPTOOLS!/rumprun-!APPTOOLS_PLATFORM!-cc
 export CXX=!APPTOOLS!/rumprun-!APPTOOLS_PLATFORM!-c++
 
-exec "$prog" --host=!ARCH!-rumprun-netbsd "$@"
+exec "$prog" --host=!GNUPLATFORM! "$@"

platform/Makefile.inc

@@ -2,6 +2,9 @@ ifeq (${PLATFORM},)
 $(error need to specify $$PLATFORM!)
 endif
 
+APP_TOOLS_GNUPLATFORM:=$(shell ${RUMPMAKE} -f bsd.own.mk \
+    -V '$${MACHINE_GNU_PLATFORM}')
+
 COREDIR:=       $(shell pwd)/../../lib/libbmk_core
 RUMPUSERDIR:=   $(shell pwd)/../../lib/libbmk_rumpuser
 BASEDIR:=       $(shell pwd)/../../lib/librumprun_base

platform/hw/Makefile

@@ -51,7 +51,6 @@ OBJS= ${OBJS_BMK} ${OBJS_APP}
 
 .PHONY:	clean cleandir test
 
-APP_TOOLS_TARGETARCH=${MACHINE}
 APP_TOOLS_PLATFORM= bmk
 APP_TOOLS_HEADOBJ= $(abspath rumprun.o)
 APP_TOOLS_OBJS=

platform/xen/Makefile

@@ -67,7 +67,6 @@ rumprun: $(OBJ_DIR)/rumprun.o
 $(OBJ_DIR)/rumprun.o: $(RUMP_OBJS) commonlibs
 	$(CC) -Wl,-r $(CFLAGS) $(LDFLAGS) $(RUMP_OBJS) -nostdlib -o $@
 
-APP_TOOLS_TARGETARCH= $(MACHINE)
 APP_TOOLS_PLATFORM= xen
 APP_TOOLS_HEADOBJ= $(abspath $(OBJ_DIR)/xen/minios.o)
 APP_TOOLS_OBJS= $(abspath $(OBJ_DIR)/rumprun.o)