X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/0b4e3aa066abc0728aacb4bbeb86f53f9737156e..483a1d1004b64bbaaef2c64c17c6b999009a54d2:/osfmk/conf/Makefile diff --git a/osfmk/conf/Makefile b/osfmk/conf/Makefile index a1d04575e..131bd8c56 100644 --- a/osfmk/conf/Makefile +++ b/osfmk/conf/Makefile @@ -18,7 +18,7 @@ ifndef OSFMK_KERNEL_CONFIG export OSFMK_KERNEL_CONFIG = $(KERNEL_CONFIG) endif -COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT) +export COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT) $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf: make build_setup @@ -52,14 +52,14 @@ do_setup_conf: $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf \ do_all: do_setup_conf @echo "[ $(SOURCE) ] Starting do_all $(COMPONENT) $(OSFMK_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"; \ - (cd $(COMPOBJROOT)/$(OSFMK_KERNEL_CONFIG); \ next_source=$(subst conf/,,$(SOURCE)); \ - ${MAKE} MAKEFILES=$(TARGET)/$(OSFMK_KERNEL_CONFIG)/Makefile \ + ${MAKE} -C $(COMPOBJROOT)/$(OSFMK_KERNEL_CONFIG) \ + MAKEFILES=$(TARGET)/$(OSFMK_KERNEL_CONFIG)/Makefile \ SOURCE=$${next_source} \ TARGET=$(TARGET) \ INCL_MAKEDEP=FALSE \ - build_all \ - ); \ + KERNEL_CONFIG=$(OSFMK_KERNEL_CONFIG) \ + build_all; \ echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(OSFMK_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"; do_build_all: do_all