Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to fix modules not getting rebuilt

Browse Source
This commit is contained in:
Kevin Lange 2017-01-06 19:54:00 +09:00
parent 217b7182a6
commit 91e5d56841
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -33,9 +33,6 @@ ENDRM = util/mk-end-rm
.SUFFIXES: .SUFFIXES:
all: $(shell util/detect-make-all.sh) all: $(shell util/detect-make-all.sh)
system: toaruos-disk.img toaruos-kernel modules
userspace: ${USERSPACE}
modules: ${MODULES}
toolchain: toolchain:
@cd toolchain; ./toolchain-build.sh @cd toolchain; ./toolchain-build.sh
@ -203,6 +200,8 @@ hdd/mod/%.ko: modules/%.c ${HEADERS} | hdd/mod
@${KCC} -T modules/link.ld -I./kernel/include -nostdlib ${CFLAGS} -c -o $@ $< ${ERRORS} @${KCC} -T modules/link.ld -I./kernel/include -nostdlib ${CFLAGS} -c -o $@ $< ${ERRORS}
@${END} "CC" "$< [module]" @${END} "CC" "$< [module]"
modules: ${MODULES}
kernel/%.o: kernel/%.S kernel/%.o: kernel/%.S
@${BEG} "AS" "$<" @${BEG} "AS" "$<"
@${KAS} ${ASFLAGS} $< -o $@ ${ERRORS} @${KAS} ${ASFLAGS} $< -o $@ ${ERRORS}
@ -213,6 +212,8 @@ kernel/%.o: kernel/%.c ${HEADERS}
@${KCC} ${CFLAGS} -nostdlib -g -I./kernel/include -c -o $@ $< ${ERRORS} @${KCC} ${CFLAGS} -nostdlib -g -I./kernel/include -c -o $@ $< ${ERRORS}
@${END} "CC" "$<" @${END} "CC" "$<"
system: toaruos-disk.img toaruos-kernel ${MODULES}
############# #############
# Userspace # # Userspace #
############# #############
@ -261,6 +262,8 @@ USERSPACE += $(foreach file,$(USER_CSTATICFILES),$(patsubst %.static.c,hdd/bin/%
USERSPACE += $(foreach file,$(USER_LIBFILES),$(patsubst %.c,hdd/usr/lib/libtoaru-%.so,$(notdir ${file}))) USERSPACE += $(foreach file,$(USER_LIBFILES),$(patsubst %.c,hdd/usr/lib/libtoaru-%.so,$(notdir ${file})))
USERSPACE += $(LIBC) hdd/bin/init hdd/lib/ld.so USERSPACE += $(LIBC) hdd/bin/init hdd/lib/ld.so
userspace: ${USERSPACE}
# Init must be built static at the moment. # Init must be built static at the moment.
hdd/bin/init: userspace/core/init.c hdd/bin/init: userspace/core/init.c
@${BEG} "CC" "$< (static)" @${BEG} "CC" "$< (static)"