From 4b8edd2b6feeec366784e3270ae50853c520c5ea Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Thu, 12 May 2022 09:38:23 -0700 Subject: [PATCH] automatic COMMANDLINE_LIBRARY w/ newer compilers --- configure/CONFIG_COMMON | 1 - configure/toolchain.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index 78abdb1b8..d245147d5 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -288,7 +288,6 @@ TARGET_LIB_LDFLAGS = $(if $(findstring $*, $(LOADABLE_LIBRARY)), \ #-------------------------------------------------- # Command-line input support default -COMMANDLINE_LIBRARY = EPICS OP_SYS_LDLIBS += $(LDLIBS_$(COMMANDLINE_LIBRARY)) OP_SYS_LDFLAGS += $(LDFLAGS_$(COMMANDLINE_LIBRARY)) RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY)) diff --git a/configure/toolchain.c b/configure/toolchain.c index a97085ae3..2f76b475b 100644 --- a/configure/toolchain.c +++ b/configure/toolchain.c @@ -35,3 +35,15 @@ OS_API = posix OS_API = score # endif #endif + +#ifdef __has_include +# if defined(__rtems__) && __RTEMS_MAJOR__<5 && __has_include() +COMMANDLINE_LIBRARY ?= LIBTECLA +# elif __has_include() +COMMANDLINE_LIBRARY ?= READLINE +# else +COMMANDLINE_LIBRARY ?= EPICS +# endif +#else +COMMANDLINE_LIBRARY ?= EPICS +#endif