xnu-517.tar.gz

[apple/xnu.git] / osfmk / conf / Makefile

diff --git a/osfmk/conf/Makefile b/osfmk/conf/Makefile
index e9eacc5e9242c06758c07f8e3d95d86da4f6e324..131bd8c567df8abaed0c327f20a3e7c875206595 100644 (file)
--- a/osfmk/conf/Makefile
+++ b/osfmk/conf/Makefile
@@ -18,7 +18,7 @@ ifndef OSFMK_KERNEL_CONFIG
 export OSFMK_KERNEL_CONFIG = $(KERNEL_CONFIG)
 endif
 
 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 
 
 $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf:
        make build_setup 


@@ -58,6 +58,7 @@ do_all: do_setup_conf
                SOURCE=$${next_source}                  \
                TARGET=$(TARGET)                                        \
                INCL_MAKEDEP=FALSE      \
                SOURCE=$${next_source}                  \
                TARGET=$(TARGET)                                        \
                INCL_MAKEDEP=FALSE      \

+               KERNEL_CONFIG=$(OSFMK_KERNEL_CONFIG)    \

                build_all;      \
        echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(OSFMK_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
 
                build_all;      \
        echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(OSFMK_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";