Fix Makefile fully

This commit is contained in:
Braiden Vasco 2017-11-08 11:11:31 +00:00
parent fc0780a19f
commit 16050f56f7
5 changed files with 7 additions and 3 deletions

View File

@ -11,7 +11,11 @@ export LIBARCH = $(shell pwd)/arch/$(ARCH)/libarch.a
export LINKER = $(shell pwd)/arch/$(ARCH)/linker.ld
export MODULES = $(addprefix $(shell pwd)/modules/, dummy1.bin dummy2.bin)
ifeq (none, $(ARCH))
run: test
else
run: run-iso
endif
all: all-kernel

View File

@ -30,7 +30,7 @@ Build and run
-------------
```sh
./configure build-x86
./configure x86
make clean
make run
```
@ -39,7 +39,7 @@ Run tests
---------
```sh
./configure test-host
./configure none
make clean
make test
```

2
configure vendored
View File

@ -3,7 +3,7 @@
ENV="$1"
if [ -z "$ENV" ]; then
ENV='build-x86'
ENV='x86'
fi
CONFIG="env/$ENV.mk"

View File

View File