Commit a92a7f0c authored by Charles Jacobsen's avatar Charles Jacobsen Committed by Vikram Narayanan

pmfs: mount: Build working, no link errors.

parent 861d9f00
......@@ -58,11 +58,23 @@ lcd_domains-y += $(addprefix common/, \
# libcap (microkernel and kliblcd share libcap. We get away with this
# because this build of libcap does not use global cap types.)
lcd_domains-y += libcap.install/lib/libcap.a
libcap_objs = $(wildcard $(MICROKERNEL_BUILD_DIR)/libcap.build/src/common/*.o)
libcap_objs := $(notdir $(libcap_objs))
libcap_objs := $(addprefix libcap.build/src/common/, $(libcap_objs))
lcd_domains-y += $(libcap_objs)
# libfipc and libasync
lcd_domains-y += libfipc.install/lib/libfipc.a
lcd_domains-y += libasync.install/lib/libasync.a
libfipc_objs = $(wildcard \
$(MICROKERNEL_BUILD_DIR)/libfipc.build/src/common/*.o)
libfipc_objs := $(notdir $(libfipc_objs))
libfipc_objs := $(addprefix libfipc.build/src/common/, $(libfipc_objs))
lcd_domains-y += $(libfipc_objs)
libasync_objs = $(wildcard \
$(MICROKERNEL_BUILD_DIR)/libasync.build/src/common/*.o)
libasync_objs := $(notdir $(libasync_objs))
libasync_objs := $(addprefix libasync.build/src/common/, $(libasync_objs))
lcd_domains-y += $(libasync_objs)
# Extra includes
ccflags-y += $(MICROKERNEL_CFLAGS)
......@@ -50,7 +50,10 @@ microkernel: $(MICROKERNEL_BUILD_DIR)/Kbuild | \
libcap.microkernel: $(MICROKERNEL_BUILD_DIR)/libcap.build/Makefile
$(MAKE) -C $(MICROKERNEL_BUILD_DIR)/libcap.build \
CFLAGS="$(MICROKERNEL_LIB_CFLAGS)" $(MAKEFLAGS) && \
$(MAKE) -C $(MICROKERNEL_BUILD_DIR)/libcap.build install $(MAKEFLAGS)
$(MAKE) -C $(MICROKERNEL_BUILD_DIR)/libcap.build install \
$(MAKEFLAGS) && \
cd $(MICROKERNEL_BUILD_DIR)/libcap.install/lib && \
ar x libcap.a
$(MICROKERNEL_BUILD_DIR)/libcap.build/Makefile: libcap/configure | \
$(MICROKERNEL_BUILD_DIRS)
......@@ -67,7 +70,10 @@ $(MICROKERNEL_BUILD_DIR)/libcap.build/Makefile: libcap/configure | \
libfipc.microkernel: $(MICROKERNEL_BUILD_DIR)/libfipc.build/Makefile
$(MAKE) -C $(MICROKERNEL_BUILD_DIR)/libfipc.build \
CFLAGS="$(MICROKERNEL_LIB_CFLAGS) -I$(MICROKERNEL_BUILD_DIR)/libcap.install/include" $(MAKEFLAGS) && \
$(MAKE) -C $(MICROKERNEL_BUILD_DIR)/libfipc.build install $(MAKEFLAGS)
$(MAKE) -C $(MICROKERNEL_BUILD_DIR)/libfipc.build install \
$(MAKEFLAGS) && \
cd $(MICROKERNEL_BUILD_DIR)/libfipc.install/lib && \
ar x libfipc.a
$(MICROKERNEL_BUILD_DIR)/libfipc.build/Makefile: \
libasync/fast-ipc-module/configure | \
......@@ -80,7 +86,10 @@ $(MICROKERNEL_BUILD_DIR)/libfipc.build/Makefile: \
libasync.microkernel: $(MICROKERNEL_BUILD_DIR)/libasync.build/Makefile
$(MAKE) -C $(MICROKERNEL_BUILD_DIR)/libasync.build \
CFLAGS="$(MICROKERNEL_LIB_CFLAGS) -I$(MICROKERNEL_BUILD_DIR)/libcap.install/include -I$(MICROKERNEL_BUILD_DIR)/libfipc.install/include -DNDEBUG" $(MAKEFLAGS) && \
$(MAKE) -C $(MICROKERNEL_BUILD_DIR)/libasync.build install $(MAKEFLAGS)
$(MAKE) -C $(MICROKERNEL_BUILD_DIR)/libasync.build install \
$(MAKEFLAGS) && \
cd $(MICROKERNEL_BUILD_DIR)/libasync.install/lib && \
ar x libasync.a
$(MICROKERNEL_BUILD_DIR)/libasync.build/Makefile: libasync/configure | \
$(MICROKERNEL_BUILD_DIRS)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment