xnu-6153.11.26.tar.gz

[apple/xnu.git] / san / conf / Makefile.template

diff --git a/san/conf/Makefile.template b/san/conf/Makefile.template
index 8c60bc15bd5ba9c4efffaf2b948c8c1c0c4b140d..42c6ee1edb1e768a4cad3306ff055c74c0eb8f11 100644 (file)
--- a/san/conf/Makefile.template
+++ b/san/conf/Makefile.template
@@ -47,19 +47,6 @@ COMP_SUBDIRS =
 # Rebuild if per-file overrides change
 ${OBJS}: $(firstword $(MAKEFILE_LIST))
 
-# set file list manually
-OBJS =
-
-ifeq ($(KASAN),1)
-OBJS += kasan.o kasan-fakestack.o kasan-memintrinsics.o kasan_dynamic_blacklist.o
-OBJS += kasan-$(CURRENT_ARCH_CONFIG_LC).o
-OBJS += kasan-test.o kasan-test-$(CURRENT_ARCH_CONFIG_LC).o
-endif
-
-ifeq ($(UBSAN),1)
-OBJS += ubsan.o ubsan_log.o
-endif
-
 # Rebuild if global compile flags change
 $(COBJS): .CFLAGS
 .CFLAGS: ALWAYS
@@ -76,13 +63,13 @@ $(SOBJS): .SFLAGS
        $(_v)$(REPLACECONTENTS) $@ $(KASAN)
 
 $(COMPONENT).filelist: $(OBJS) .KASANFLAGS
-       @echo "$(ColorL)LDFILELIST$(Color0) $(ColorLF)$(COMPONENT)$(Color0)"
+       $(call makelog,$(ColorL)LDFILELIST$(Color0) $(ColorLF)$(COMPONENT)$(Color0))
        $(_v)for obj in ${OBJS}; do     \
-                echo $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
+                $(ECHO) $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
        done > $(COMPONENT).filelist
 
 $(TARGET)/$(CURRENT_KERNEL_CONFIG)/kasan_blacklist_dynamic.h: $(SRCROOT)/$(COMPONENT)/kasan-blacklist-dynamic
-       @echo "$(ColorH)GENERATING$(Color0)    $(ColorLF)$(notdir $@)$(Color0)"
+       $(call makelog,$(ColorH)GENERATING$(Color0)    $(ColorLF)$(notdir $@)$(Color0))
        @$(SRCROOT)/$(COMPONENT)/tools/generate_dynamic_blacklist.py "$<" > "$@"
 
 $(SRCROOT)/$(COMPONENT)/kasan_dynamic_blacklist.c: $(TARGET)/$(CURRENT_KERNEL_CONFIG)/kasan_blacklist_dynamic.h