From 99e7e7727a6c9b0ce593000552c65a375918cddc Mon Sep 17 00:00:00 2001 From: Janet Anderson Date: Thu, 11 Nov 2010 13:45:09 -0600 Subject: [PATCH] Provide a link-time path for readline directory. Remove unneeded READLINE definitions from last commit. --- configure/os/CONFIG.Common.linux-arm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configure/os/CONFIG.Common.linux-arm b/configure/os/CONFIG.Common.linux-arm index 100d7e029..8b0a8c2a4 100644 --- a/configure/os/CONFIG.Common.linux-arm +++ b/configure/os/CONFIG.Common.linux-arm @@ -30,9 +30,10 @@ ifeq ($(BUILD_CLASS),CROSS) PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath-link,%) PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)) - LDLIBS_READLINE += -lreadline -lcurses - LDFLAGS_READLINE += -L$(GNU_DIR)/lib - RUNTIME_LDFLAGS_READLINE += -R$(GNU_DIR)/lib - RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY)) + # Provide a link-time path for readline + RUNTIME_LDFLAGS_READLINE_YES = -Wl,-rpath-link,$(GNU_DIR)/lib + RUNTIME_LDFLAGS_READLINE = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)) + RUNTIME_LDFLAGS_READLINE_CURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)) + RUNTIME_LDFLAGS_READLINE_NCURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)) endif