X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/0b4e3aa066abc0728aacb4bbeb86f53f9737156e..4452a7af2eac33dbad800bcc91f2399d62c18f53:/iokit/conf/Makefile

diff --git a/iokit/conf/Makefile b/iokit/conf/Makefile
index 42a0c8b7b..34ca97c17 100644
--- a/iokit/conf/Makefile
+++ b/iokit/conf/Makefile
@@ -18,7 +18,7 @@ ifndef IOKIT_KERNEL_CONFIG
 export IOKIT_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 
@@ -47,14 +47,14 @@ do_setup_conf: $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf \
 
 do_all: do_setup_conf
 	@echo "[ $(SOURCE) ] Starting do_all  $(COMPONENT) $(IOKIT_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";	\
-	(cd $(COMPOBJROOT)/$(IOKIT_KERNEL_CONFIG);				\
 	next_source=$(subst conf/,,$(SOURCE));			\
-	${MAKE} MAKEFILES=$(TARGET)/$(IOKIT_KERNEL_CONFIG)/Makefile	\
+	${MAKE} -C $(COMPOBJROOT)/$(IOKIT_KERNEL_CONFIG)	\
+		MAKEFILES=$(TARGET)/$(IOKIT_KERNEL_CONFIG)/Makefile	\
 		SOURCE=$${next_source}			\
 		TARGET=$(TARGET)					\
 		INCL_MAKEDEP=FALSE	\
-		build_all	\
-	);		\
+		KERNEL_CONFIG=$(IOKIT_KERNEL_CONFIG) \
+		build_all;	\
 	echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(IOKIT_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
 
 do_build_all:  do_all