xnu-4570.1.46.tar.gz

[apple/xnu.git] / makedefs / MakeInc.top

diff --git a/makedefs/MakeInc.top b/makedefs/MakeInc.top
index c19e8e59fa842441d0134674b2ed419e23027b25..c552c108a3d44a9a95268daae1e57c04c3f435d4 100644 (file)
--- a/makedefs/MakeInc.top
+++ b/makedefs/MakeInc.top
@@ -56,8 +56,12 @@ endif
 # Kernel Configuration options
 #
 
 # Kernel Configuration options
 #
 

+DEFAULT_PRODUCT_CONFIGS :=
+

 ifeq ($(RC_ProjectName),xnu_debug)
 override DEFAULT_KERNEL_CONFIG := DEBUG
 ifeq ($(RC_ProjectName),xnu_debug)
 override DEFAULT_KERNEL_CONFIG := DEBUG

+else ifeq ($(RC_ProjectName),xnu_kasan)
+override KERNEL_CONFIGS := KASAN

 else ifneq ($(filter $(SUPPORTED_EMBEDDED_PLATFORMS),$(PLATFORM)),)
 override DEFAULT_KERNEL_CONFIG := DEVELOPMENT
 else ifeq ($(PLATFORM),MacOSX)
 else ifneq ($(filter $(SUPPORTED_EMBEDDED_PLATFORMS),$(PLATFORM)),)
 override DEFAULT_KERNEL_CONFIG := DEVELOPMENT
 else ifeq ($(PLATFORM),MacOSX)


@@ -71,6 +75,11 @@ ifndef KERNEL_CONFIGS
 KERNEL_CONFIGS := DEFAULT
 endif
 
 KERNEL_CONFIGS := DEFAULT
 endif
 

+# If PRODUCT_CONFIGS is specified it should override default
+ifndef PRODUCT_CONFIGS
+PRODUCT_CONFIGS := $(DEFAULT_PRODUCT_CONFIGS)
+endif
+

 #
 # Machine Configuration options
 #
 #
 # Machine Configuration options
 #


@@ -158,7 +167,7 @@ TARGET_CONFIGS_ALIASES_UC := $(strip $(shell printf "%s" "$(TARGET_CONFIGS_ALIAS
 # TARGET_CONFIGS is unwieldy for use in Makefiles. Convert them to
 # "build configurations" which are tuples joined by "^". For
 # example, "RELEASE I386 DEFAULT DEVELOPMENT ARM DEFAULT" becomes
 # TARGET_CONFIGS is unwieldy for use in Makefiles. Convert them to
 # "build configurations" which are tuples joined by "^". For
 # example, "RELEASE I386 DEFAULT DEVELOPMENT ARM DEFAULT" becomes

-# "RELEASE^I386^NONE DEVELOPMENT^ARM^S5L8920X", which can be looped
+# "RELEASE^I386^NONE DEVELOPMENT^ARM^T8002", which can be looped

 # over trivially. PRIMARY_BUILD_CONFIGS is the first config
 # for each architecture, used primarily for machine-dependent recursion.
 
 # over trivially. PRIMARY_BUILD_CONFIGS is the first config
 # for each architecture, used primarily for machine-dependent recursion.
 


@@ -340,6 +349,9 @@ exporthdrs_md: build_exporthdrs_md_bootstrap
 .PHONY: installhdrs installhdrs_mi installhdrs_md
 
 ifeq ($(RC_ProjectName),xnu_debug)
 .PHONY: installhdrs installhdrs_mi installhdrs_md
 
 ifeq ($(RC_ProjectName),xnu_debug)

+installhdrs:
+       @:
+else ifeq ($(RC_ProjectName),xnu_kasan)

 installhdrs:
        @:
 else
 installhdrs:
        @:
 else


@@ -469,6 +481,8 @@ final_touch_config_timestamps: config_install_bootstrap
 
 ifeq ($(RC_ProjectName),xnu_debug)
 install: install_kernels
 
 ifeq ($(RC_ProjectName),xnu_debug)
 install: install_kernels

+else ifeq ($(RC_ProjectName),xnu_kasan)
+install: install_config install_kernels

 else ifeq ($(RC_ProjectName),xnu_headers_Sim)
 install: installhdrs
 else
 else ifeq ($(RC_ProjectName),xnu_headers_Sim)
 install: installhdrs
 else