Simplify nolibc Makefile

No architecture specific ifdefs needed anymore, we can reuse
BUILDRUMP_TOOLFLAGS for i386.

diff --git a/tests/nolibc/Makefile b/tests/nolibc/Makefile
index 81d6739e153e67106f37f71b75815063026524b9..08d0735424f11a828c3f511e59235bfc26790411 100644 (file)
--- a/tests/nolibc/Makefile
+++ b/tests/nolibc/Makefile
@@ -13,24 +13,20 @@ LDFLAGS:= -L$(abspath ../../rumprun/lib)
 LDFLAGS+= -L$(abspath ../../lib/libcompiler_rt/${PLATFORM})
 
 CPPFLAGS+= -I../../include -I../../rumprun/include -I../../platform/${PLATFORM}/include
-CPPFLAGS+= -nostdlib
 
 LDSCRIPT=$(abspath ../../platform/${PLATFORM}/bmk.ldscript)
 
 LDFLAGS+= ${LDFLAGS.${PLATFORM}.${MACHINE_ARCH}}
 
-ifeq (${MACHINE},i386)
-LDFLAGS+= -m elf_i386
-endif
-
 OBJS= main.o $(abspath ../../platform/${PLATFORM}/rumprun-${PLATFORM}-${MACHINE_ARCH}.o)
 
 .PHONY: clean
 
 main.elf: ${OBJS}
-       ${LD} ${LDFLAGS} -T${LDSCRIPT}                                  \
+       ${CC} ${CFLAGS} ${LDFLAGS} -T${LDSCRIPT}                        \
        ${OBJS}                                                         \
-       --whole-archive -lrumpvfs -lrump --no-whole-archive             \
+       -nostdlib                                                       \
+       -Wl,--whole-archive -lrumpvfs -lrump -Wl,--no-whole-archive     \
        -lcompiler_rt                                                   \
        -o $@