From 761ebff6d74059d886fc3fb6ae9cea65c7e591d2 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 28 Oct 2020 13:41:00 -0500 Subject: [PATCH] Simplify RTEMS OP_SYS_CFLAGS settings --- configure/os/CONFIG.Common.RTEMS | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configure/os/CONFIG.Common.RTEMS b/configure/os/CONFIG.Common.RTEMS index 5bd06e953..610057d53 100644 --- a/configure/os/CONFIG.Common.RTEMS +++ b/configure/os/CONFIG.Common.RTEMS @@ -96,16 +96,13 @@ MODEXT=.obj OS_CLASS = RTEMS #-------------------------------------------------- -# Operating system flags -ifeq ($(OS_API),posix) - OP_SYS_CFLAGS += -D__LINUX_ERRNO_EXTENSIONS__ -endif +# Operating system compile & link flags +OP_SYS_CFLAGS_API_posix = -D__LINUX_ERRNO_EXTENSIONS__ +OP_SYS_CFLAGS += $(OP_SYS_CFLAGS_API_$(OS_API)) -ifeq ($(RTEMS_HAS_NETWORKING),yes) - OP_SYS_CFLAGS += -DRTEMS_LEGACY_STACK -else - OP_SYS_CFLAGS += -DHAVE_SOCKADDR_SA_LEN=1 -endif +OP_SYS_CFLAGS_NET_yes = -DRTEMS_LEGACY_STACK +OP_SYS_CFLAGS_NET_no = -DHAVE_SOCKADDR_SA_LEN=1 +OP_SYS_CFLAGS += $(OP_SYS_CFLAGS_NET_$(RTEMS_HAS_NETWORKING)) OP_SYS_LDLIBS_posix = -ltftpfs -lbsd -lz OP_SYS_LDLIBS_kernel = -lCom -lnfs