From 962c853e6799c2db7ff374c2af7987eeef788172 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Thu, 6 Apr 2017 19:36:58 +0200 Subject: [PATCH] hw: rename bootstrap.o to bootstrap-hw.o In order to deliver base-hw as a binary archive, we need to install the bootstap.o file to bin/. Since bin/ is a global name space shared by all kernels, this patch renames the object file to bootstap-hw.o and thereby clarifies the association of the file with base-hw. --- repos/base-hw/src/bootstrap/hw/target.mk | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/repos/base-hw/src/bootstrap/hw/target.mk b/repos/base-hw/src/bootstrap/hw/target.mk index 06c3d050c..66b680ad8 100644 --- a/repos/base-hw/src/bootstrap/hw/target.mk +++ b/repos/base-hw/src/bootstrap/hw/target.mk @@ -1,10 +1,22 @@ TARGET = bootstrap LIBS = bootstrap-hw -BOOTSTRAP_OBJ = bootstrap.o +BOOTSTRAP_OBJ = bootstrap-hw.o -$(TARGET): $(BOOTSTRAP_OBJ) +$(TARGET): $(VERBOSE)true +ifneq ($(INSTALL_DIR),) +ifneq ($(DEBUG_DIR),) +$(TARGET): $(INSTALL_DIR)/$(BOOTSTRAP_OBJ) + +$(INSTALL_DIR)/$(BOOTSTRAP_OBJ) : $(DEBUG_DIR)/$(BOOTSTRAP_OBJ) + $(VERBOSE)$(STRIP) --strip-debug -o $@ $< + +$(DEBUG_DIR)/$(BOOTSTRAP_OBJ) : $(BOOTSTRAP_OBJ) + $(VERBOSE)ln -sf $(CURDIR)/$(BOOTSTRAP_OBJ) $(DEBUG_DIR)/$(BOOTSTRAP_OBJ) +endif +endif + .PHONY: $(BOOTSTRAP_OBJ) $(BOOTSTRAP_OBJ): $(VERBOSE)$(LD) $(LD_MARCH) -u _start --whole-archive -r $(LINK_ITEMS) $(LIBCXX_GCC) -o $@