summaryrefslogtreecommitdiff
path: root/kernel/Makefile
diff options
context:
space:
mode:
authorDmitriy Korovkin <dmitriy.korovkin@windriver.com>2016-10-03 14:58:18 -0400
committerAnas Nashif <nashif@linux.intel.com>2016-10-05 10:29:31 +0000
commit19f2884738a92583b28d9edf514e0c18438b65d1 (patch)
treef00669b8a2cab9d9e4623b814bc6b2488a8441e5 /kernel/Makefile
parentd846dd1fcd8ee531080cb1c0ef5b86d4d812c98e (diff)
unified: Fix build broblem caused by concurrent make processes in single dir
Make sure that kernel/unified, that is included in libs-y does not built recursively through building kernel/ directory. Make sure that any lib.a library is not included into libzephyr.a and thus object modules from those lib.a files are linked only if a function from that object module is referenced from the application. Jira: ZEP-1025 Change-Id: Id3a3e96ca0b8abc9aedde0ffb9baa0164e380464 Signed-off-by: Dmitriy Korovkin <dmitriy.korovkin@windriver.com>
Diffstat (limited to 'kernel/Makefile')
-rw-r--r--kernel/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index aaa74753f..9b6e2c704 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,6 +1,4 @@
-ifeq ($(CONFIG_KERNEL_V2),y)
-obj-y = unified/
-else
+ifneq ($(CONFIG_KERNEL_V2),y)
obj-y = nanokernel/
obj-$(CONFIG_MICROKERNEL) += microkernel/
endif