From 4be8c2daa4de47f45724c28560b02e58fbae2cf2 Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Wed, 14 Sep 2016 12:12:38 +0200 Subject: [PATCH] build: remove STARTUP_LIB variable (fix #2098) --- repos/base-fiasco/mk/l4_pkg.mk | 1 - repos/base-fiasco/src/kernel/target.inc | 1 - repos/base-foc/mk/l4_pkg.mk | 1 - repos/base-foc/src/kernel/target.inc | 1 - repos/base-nova/src/kernel/target.mk | 1 - repos/base-okl4/src/kernel/target.inc | 1 - repos/base-pistachio/src/kernel/target.mk | 1 - 7 files changed, 7 deletions(-) diff --git a/repos/base-fiasco/mk/l4_pkg.mk b/repos/base-fiasco/mk/l4_pkg.mk index d01a25794..7ba396c70 100644 --- a/repos/base-fiasco/mk/l4_pkg.mk +++ b/repos/base-fiasco/mk/l4_pkg.mk @@ -25,7 +25,6 @@ all: l4_build_arch_undefined endif L4_PKG_DIR = $(L4_SRC_DIR)/l4/pkg -STARTUP_LIB = PKG_TAGS = $(addsuffix .tag,$(PKGS)) ifeq ($(VERBOSE),) diff --git a/repos/base-fiasco/src/kernel/target.inc b/repos/base-fiasco/src/kernel/target.inc index 281ab4e4d..e536962b8 100644 --- a/repos/base-fiasco/src/kernel/target.inc +++ b/repos/base-fiasco/src/kernel/target.inc @@ -3,7 +3,6 @@ REQUIRES += fiasco FIASCO_BUILD_DIR = $(BUILD_BASE_DIR)/kernel/$(TARGET) FIASCO = $(FIASCO_BUILD_DIR)/fiasco FIASCO_SRC = $(L4_SRC_DIR)/kernel/fiasco -STARTUP_LIB = $(TARGET): $(FIASCO) diff --git a/repos/base-foc/mk/l4_pkg.mk b/repos/base-foc/mk/l4_pkg.mk index 54e4ca66a..bfa0af13e 100644 --- a/repos/base-foc/mk/l4_pkg.mk +++ b/repos/base-foc/mk/l4_pkg.mk @@ -35,7 +35,6 @@ endif L4_BUILD_DIR = $(BUILD_BASE_DIR)/l4 L4_BUILD_OPT = SYSTEM_TARGET=$(CROSS_DEV_PREFIX) L4_PKG_DIR := $(call select_from_ports,foc)/src/kernel/foc/l4/pkg -STARTUP_LIB = PKG_TAGS = $(addsuffix .tag,$(PKGS)) $(TARGET): $(PKG_TAGS) diff --git a/repos/base-foc/src/kernel/target.inc b/repos/base-foc/src/kernel/target.inc index ecd1d4dfc..1bb0f0114 100644 --- a/repos/base-foc/src/kernel/target.inc +++ b/repos/base-foc/src/kernel/target.inc @@ -3,7 +3,6 @@ REQUIRES += foc FOC_BUILD_DIR = $(BUILD_BASE_DIR)/kernel/$(TARGET) FIASCO = $(FOC_BUILD_DIR)/fiasco FIASCO_SRC := $(call select_from_ports,foc)/src/kernel/foc/kernel/fiasco -STARTUP_LIB = $(TARGET): $(FIASCO) diff --git a/repos/base-nova/src/kernel/target.mk b/repos/base-nova/src/kernel/target.mk index 385bee12c..1ef1c1d95 100644 --- a/repos/base-nova/src/kernel/target.mk +++ b/repos/base-nova/src/kernel/target.mk @@ -3,7 +3,6 @@ include $(call select_from_repositories,mk/spec/nova.mk) TARGET = hypervisor REQUIRES = x86 nova NOVA_BUILD_DIR = $(BUILD_BASE_DIR)/kernel -STARTUP_LIB = SRC_CC = $(sort $(notdir $(wildcard $(NOVA_SRC_DIR)/src/*.cpp))) SRC_S = $(sort $(notdir $(wildcard $(NOVA_SRC_DIR)/src/*.S))) INC_DIR = $(NOVA_SRC_DIR)/include diff --git a/repos/base-okl4/src/kernel/target.inc b/repos/base-okl4/src/kernel/target.inc index 9f66792a9..8d7914f40 100644 --- a/repos/base-okl4/src/kernel/target.inc +++ b/repos/base-okl4/src/kernel/target.inc @@ -2,7 +2,6 @@ TARGET = kernel OKL4_SRC_DIR = $(call select_from_ports,okl4)/src/kernel/okl4 OKL4_BUILD_DIR = $(BUILD_BASE_DIR)/kernel REQUIRES += okl4 -STARTUP_LIB = LIBS = kernel SRC_O += $(addprefix $(OKL4_BUILD_DIR)/asm/,$(addsuffix .o,$(basename $(SRC_SPP)))) SRC_CC += $(subst $(OKL4_SRC_DIR)/,,$(wildcard $(OKL4_SRC_DIR)/pistachio/kdb/src/*.cc)) \ diff --git a/repos/base-pistachio/src/kernel/target.mk b/repos/base-pistachio/src/kernel/target.mk index 58d56e10d..453bfca9c 100644 --- a/repos/base-pistachio/src/kernel/target.mk +++ b/repos/base-pistachio/src/kernel/target.mk @@ -3,7 +3,6 @@ REQUIRES += pistachio KERNEL_BUILD_DIR = $(BUILD_BASE_DIR)/kernel/pistachio KERNEL = $(KERNEL_BUILD_DIR)/x86-kernel KERNEL_SRC := $(call select_from_ports,pistachio)/src/kernel/pistachio/kernel -STARTUP_LIB = LIBGCC_DIR = $(dir $(shell $(CC) $(CC_MARCH) -print-libgcc-file-name)) GCCINC_DIR = $(dir $(shell $(CC) -print-libgcc-file-name))include