ld-tool portability fix: MacOS build experience

[lunaix-os.git] / lunaix-os / kernel.mk

diff --git a/lunaix-os/kernel.mk b/lunaix-os/kernel.mk
index 189e97046385d7ffa581e5e52467bbf3cab2f3b3..86f4668910c098fcb70610f4b93a859d5226fb73 100644 (file)
--- a/lunaix-os/kernel.mk
+++ b/lunaix-os/kernel.mk
@@ -1,49 +1,35 @@
 include os.mkinc
 include toolchain.mkinc
 
-kexclusion = $(shell cat ksrc.excludes)
-
-define ksrc_dirs
-       kernel
-       hal
-       libs
-       arch/$(ARCH)
-endef
-
-define kinc_dirs
-       includes
-       includes/usr
-       arch/$(ARCH)/includes
-endef
-
+include .builder/lbuild.mkinc
 
 kbin_dir := $(BUILD_DIR)
 kbin := $(BUILD_NAME)
 
-ksrc_files := $(foreach f, $(ksrc_dirs), $(shell find $(f) -name "*.[cS]"))
-ksrc_files := $(filter-out $(kexclusion),$(ksrc_files))
-ksrc_objs := $(addsuffix .o,$(ksrc_files))
-ksrc_deps := $(addsuffix .d,$(ksrc_files))
-
-kinc_opts := $(addprefix -I,$(kinc_dirs))
+ksrc_objs := $(addsuffix .o,$(_LBUILD_SRCS))
+ksrc_deps := $(addsuffix .d,$(_LBUILD_SRCS))
+khdr_opts := $(addprefix -include ,$(_LBUILD_HDRS))
+kinc_opts := $(addprefix -I,$(_LBUILD_INCS))
+config_h += -include.builder/configs.h
 
 tmp_kbin  := $(BUILD_DIR)/tmpk.bin
 ksymtable := lunaix_ksyms.o
 
-CFLAGS += -include flags.h
-CFLAGS += -include config.h
+CFLAGS += $(khdr_opts) $(kinc_opts) $(config_h) -MMD -MP
+
+-include $(ksrc_deps)
 
-%.S.o: %.S
+%.S.o: %.S kernel.mk
        $(call status_,AS,$<)
-       @$(CC) $(CFLAGS) $(kinc_opts) -c $< -o $@
+       @$(CC) $(CFLAGS) -c $< -o $@
 
-%.c.o: %.c
+%.c.o: %.c kernel.mk
        $(call status_,CC,$<)
-       @$(CC) $(CFLAGS) $(kinc_opts) -c $< -o $@
+       @$(CC) $(CFLAGS) -c $< -o $@
 
 $(tmp_kbin): $(ksrc_objs)
        $(call status_,LD,$@)
-       @$(CC) -T link/linker.ld $(LDFLAGS) -o $@ $^
+       @$(CC) -T link/linker.ld $(config_h) $(LDFLAGS) -o $@ $^
 
 $(ksymtable): $(tmp_kbin)
        $(call status_,KSYM,$@)
@@ -53,7 +39,7 @@ $(ksymtable): $(tmp_kbin)
 .PHONY: __do_relink
 __do_relink: $(ksrc_objs) $(ksymtable)
        $(call status_,LD,$(kbin))
-       @$(CC) -T link/linker.ld $(LDFLAGS) -o $(kbin) $^
+       @$(CC) -T link/linker.ld $(config_h) $(LDFLAGS) -o $(kbin) $^
        @rm $(tmp_kbin)
 
 .PHONY: all