diff options
| -rw-r--r-- | src/cmd/Makefile | 8 | ||||
| -rw-r--r-- | src/cmd/test/Makefile | 3 | ||||
| -rw-r--r-- | src/cmd/test/test.c | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/cmd/Makefile b/src/cmd/Makefile index 2d1c7f8..e5eee71 100644 --- a/src/cmd/Makefile +++ b/src/cmd/Makefile @@ -1,9 +1,13 @@ LDSCRIPT=../../sys/arch/$(TARGET)/conf/user.ld +LIBC_DIR = lib/libc +CC = +AS = +LD = .PHONY: all all: - cd test/; LDSCRIPT=$(LDSCRIPT) CC=$(CC) ASM=$(ASM) \ - LD=$(ASM) SYSROOT=$(SYSROOT) make + cd test/; LDSCRIPT=$(LDSCRIPT) CC=$(CC) AS=$(AS) LD=$(LD) SYSROOT=$(SYSROOT) \ + LIBC_DIR=$(shell pwd)/../$(LIBC_DIR) make .PHONY: clean clean: diff --git a/src/cmd/test/Makefile b/src/cmd/test/Makefile index d1488b5..d0a6795 100644 --- a/src/cmd/test/Makefile +++ b/src/cmd/test/Makefile @@ -2,10 +2,11 @@ include ../../data/build/user.mk CFILES = $(shell find . -name "*.c") CFILES = $(shell find . -name "*.c") +CFLAGS = -L$(LIBC_DIR) -lc $(INTERNAL_CFLAGS) OBJECTS = $(CFILES:%.c=%.o) $(SYSROOT)/usr/bin/test: $(OBJECTS) - $(LD) $(OBJECTS) -o $@ $(INTERNAL_CFLAGS) + $(LD) $(OBJECTS) -o $@ $(CFLAGS) %.o: %.c $(CC) $(INTERNAL_CFLAGS) -c $(CFLAGS) $< -o $@ diff --git a/src/cmd/test/test.c b/src/cmd/test/test.c index 693fb65..66b8c19 100644 --- a/src/cmd/test/test.c +++ b/src/cmd/test/test.c @@ -1,6 +1,5 @@ -__attribute__((naked)) void -_start(void) +main(void) { for (;;); } |