mirror of
https://github.com/tailix/kernel.git
synced 2024-11-13 11:14:07 -05:00
Fix Makefile fully
This commit is contained in:
parent
fc0780a19f
commit
16050f56f7
5 changed files with 7 additions and 3 deletions
4
Makefile
4
Makefile
|
@ -11,7 +11,11 @@ export LIBARCH = $(shell pwd)/arch/$(ARCH)/libarch.a
|
||||||
export LINKER = $(shell pwd)/arch/$(ARCH)/linker.ld
|
export LINKER = $(shell pwd)/arch/$(ARCH)/linker.ld
|
||||||
export MODULES = $(addprefix $(shell pwd)/modules/, dummy1.bin dummy2.bin)
|
export MODULES = $(addprefix $(shell pwd)/modules/, dummy1.bin dummy2.bin)
|
||||||
|
|
||||||
|
ifeq (none, $(ARCH))
|
||||||
|
run: test
|
||||||
|
else
|
||||||
run: run-iso
|
run: run-iso
|
||||||
|
endif
|
||||||
|
|
||||||
all: all-kernel
|
all: all-kernel
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ Build and run
|
||||||
-------------
|
-------------
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
./configure build-x86
|
./configure x86
|
||||||
make clean
|
make clean
|
||||||
make run
|
make run
|
||||||
```
|
```
|
||||||
|
@ -39,7 +39,7 @@ Run tests
|
||||||
---------
|
---------
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
./configure test-host
|
./configure none
|
||||||
make clean
|
make clean
|
||||||
make test
|
make test
|
||||||
```
|
```
|
||||||
|
|
2
configure
vendored
2
configure
vendored
|
@ -3,7 +3,7 @@
|
||||||
ENV="$1"
|
ENV="$1"
|
||||||
|
|
||||||
if [ -z "$ENV" ]; then
|
if [ -z "$ENV" ]; then
|
||||||
ENV='build-x86'
|
ENV='x86'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CONFIG="env/$ENV.mk"
|
CONFIG="env/$ENV.mk"
|
||||||
|
|
0
env/test-host.mk → env/none.mk
vendored
0
env/test-host.mk → env/none.mk
vendored
0
env/build-x86.mk → env/x86.mk
vendored
0
env/build-x86.mk → env/x86.mk
vendored
Loading…
Reference in a new issue