xnu-4903.221.2.tar.gz

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

diff --git a/libkern/conf/Makefile.template b/libkern/conf/Makefile.template
index 5885a434c6afa646660dcb2e161c2d35d8e94509..b38b73fe1a353954cd33fc1a14831bfecf8cccbc 100644 (file)
--- a/libkern/conf/Makefile.template
+++ b/libkern/conf/Makefile.template
@@ -17,27 +17,32 @@ include $(MakeInc_def)
 # CFLAGS
 #
 CFLAGS+= -include meta_features.h -DLIBKERN_KERNEL_PRIVATE -DOSALLOCDEBUG=1
+SFLAGS+= -include meta_features.h
 
 # Objects that don't want -Wcast-align warning (8474835)
 OSKextLib.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align
-OSKext.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align
+OSKext.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align -Wno-cast-qual
 OSMetaClass.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align
-OSUnserialize.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align
+OSRuntime.cpo_CXXWARNFLAGS_ADD += -Wno-missing-prototypes
+OSUnserialize.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align -Wno-unreachable-code-break
 corecrypto_md5.o_CWARNFLAGS_ADD = -Wno-cast-align
 corecrypto_sha1.o_CWARNFLAGS_ADD = -Wno-cast-align
 
 # zlib is 3rd party source
-compress.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-deflate.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-infback.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-inffast.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-inflate.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-trees.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-uncompr.o_CWARNFLAGS_ADD = -Wno-cast-qual 
+compress.o_CWARNFLAGS_ADD = -Wno-cast-qual
+deflate.o_CWARNFLAGS_ADD = -Wno-cast-qual
+infback.o_CWARNFLAGS_ADD = -Wno-cast-qual
+inffast.o_CWARNFLAGS_ADD = -Wno-cast-qual
+inflate.o_CWARNFLAGS_ADD = -Wno-cast-qual
+trees.o_CWARNFLAGS_ADD = -Wno-cast-qual
+uncompr.o_CWARNFLAGS_ADD = -Wno-cast-qual
+
+# libclosure
+runtime.cpo_CXXWARNFLAGS_ADD = -Wno-cast-qual
+
 
 # warnings in bison-generated code
-OSUnserializeXML.cpo_CXXWARNFLAGS_ADD = -Wno-uninitialized
-OSUnserializeXML.cpo_CXXWARNFLAGS_ADD += -Wno-unreachable-code
+OSUnserializeXML.cpo_CXXWARNFLAGS_ADD += -Wno-uninitialized -Wno-unreachable-code -Wno-unreachable-code-break
 OSUnserialize.cpo_CXXWARNFLAGS_ADD += -Wno-unreachable-code
 
 # Runtime support functions don't interact well with LTO (9294679)
@@ -46,7 +51,7 @@ stack_protector.o_CFLAGS_ADD += $(CFLAGS_NOLTO_FLAG)
 #
 # Directories for mig generated files
 #
-COMP_SUBDIRS = 
+COMP_SUBDIRS =
 
 #
 #  Make sure we don't remove this by accident if interrupted at the wrong
@@ -72,24 +77,6 @@ COMP_SUBDIRS =
 
 %MACHDEP
 
-#
-# Machine-independent per-file flags
-#
-
-# zlib is 3rd party source
-compress.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-deflate.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-infback.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-inffast.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-inflate.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-trees.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-uncompr.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-
-# warnings in bison-generated code
-OSUnserializeXML.cpo_CXXWARNFLAGS_ADD = -Wno-uninitialized
-OSUnserializeXML.cpo_CXXWARNFLAGS_ADD += -Wno-unreachable-code
-OSUnserialize.cpo_CXXWARNFLAGS_ADD += -Wno-unreachable-code
-
 # Rebuild if per-file overrides change
 ${OBJS}: $(firstword $(MAKEFILE_LIST))
 
@@ -107,13 +94,13 @@ $(SOBJS): .SFLAGS
 $(COMPONENT).filelist: $(OBJS)
        $(_v)for hib_file in ${HIB_FILES}; \
        do      \
-               $(SEG_HACK) -n __HIB -o $${hib_file}__ $${hib_file} ; \
-               mv $${hib_file}__ $${hib_file} ; \
+               $(SEG_HACK) -n __HIB -o $${hib_file}__ $${hib_file} || exit 1; \
+               mv $${hib_file}__ $${hib_file} || exit 1; \
        done
-       @echo LDFILELIST $(COMPONENT)
-       $(_v)( for obj in ${OBJS}; do   \
+       @echo "$(ColorL)LDFILELIST$(Color0) $(ColorLF)$(COMPONENT)$(Color0)"
+       $(_v)for obj in ${OBJS}; do     \
                 echo $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
-       done; ) > $(COMPONENT).filelist
+       done > $(COMPONENT).filelist
 
 do_all: $(COMPONENT).filelist