From edbb5ec3281b8cf91c2f216e4486bd29318dc1b1 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 26 Nov 2015 13:17:32 -0600 Subject: [PATCH] arch-specific build needs to include __KERNEL__ flags --- LibTargets.mk | 13 ++++++------- configs | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/LibTargets.mk b/LibTargets.mk index 757a9cb1b7..24a2627a9c 100755 --- a/LibTargets.mk +++ b/LibTargets.mk @@ -64,7 +64,6 @@ $(ARCH_SRC)$(DELIM)libkarch$(LIBEXT): context lib$(DELIM)libkarch$(LIBEXT): $(ARCH_SRC)$(DELIM)libkarch$(LIBEXT) $(Q) install $(ARCH_SRC)$(DELIM)libkarch$(LIBEXT) lib$(DELIM)libkarch$(LIBEXT) - sched$(DELIM)libsched$(LIBEXT): context $(Q) $(MAKE) -C sched TOPDIR="$(TOPDIR)" libsched$(LIBEXT) KERNEL=y EXTRADEFINES=$(KDEFINE) @@ -119,6 +118,12 @@ audio$(DELIM)libaudio$(LIBEXT): context lib$(DELIM)libaudio$(LIBEXT): audio$(DELIM)libaudio$(LIBEXT) $(Q) install audio$(DELIM)libaudio$(LIBEXT) lib$(DELIM)libaudio$(LIBEXT) +$(ARCH_SRC)$(DELIM)libarch$(LIBEXT): context + $(Q) $(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" libarch$(LIBEXT) KERNEL=y EXTRADEFINES=$(KDEFINE) + +lib$(DELIM)libarch$(LIBEXT): $(ARCH_SRC)$(DELIM)libarch$(LIBEXT) + $(Q) install $(ARCH_SRC)$(DELIM)libarch$(LIBEXT) lib$(DELIM)libarch$(LIBEXT) + # Special case syscall$(DELIM)libstubs$(LIBEXT): context @@ -190,9 +195,3 @@ mm$(DELIM)libmm$(LIBEXT): context lib$(DELIM)libmm$(LIBEXT): mm$(DELIM)libmm$(LIBEXT) $(Q) install mm$(DELIM)libmm$(LIBEXT) lib$(DELIM)libmm$(LIBEXT) - -$(ARCH_SRC)$(DELIM)libarch$(LIBEXT): context - $(Q) $(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" libarch$(LIBEXT) - -lib$(DELIM)libarch$(LIBEXT): $(ARCH_SRC)$(DELIM)libarch$(LIBEXT) - $(Q) install $(ARCH_SRC)$(DELIM)libarch$(LIBEXT) lib$(DELIM)libarch$(LIBEXT) diff --git a/configs b/configs index 28e45ddd60..b52f98b9c9 160000 --- a/configs +++ b/configs @@ -1 +1 @@ -Subproject commit 28e45ddd60209c12e6e8cae0c3100ee06c9cc36b +Subproject commit b52f98b9c91f8d84e7484e818e065b1e63b1d469