From 17ed9b77967f6a8ba2deb281a730df3b33fdadb3 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Wed, 3 Jun 2020 23:38:02 +0200 Subject: [PATCH] OS renamed to OS_FSFW (nameclash with system variable) --- framework.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework.mk b/framework.mk index cb3e4f22..f2107a4c 100644 --- a/framework.mk +++ b/framework.mk @@ -28,11 +28,11 @@ CXXSRC += $(wildcard $(FRAMEWORK_PATH)/objectmanager/*.cpp) CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/*.cpp) # select the OS -ifeq ($(OS),rtems) +ifeq ($(OS_FSFW),rtems) CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/rtems/*.cpp) -else ifeq ($(OS),linux) +else ifeq ($(OS_FSFW),linux) CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/linux/*.cpp) -else ifeq ($(OS),freeRTOS) +else ifeq ($(OS_FSFW),freeRTOS) CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/FreeRTOS/*.cpp) else $(error invalid OS specified, valid OS are rtems, linux, freeRTOS)