diff --git a/configure/os/CONFIG.Common.linux-xscale_be b/configure/os/CONFIG.Common.linux-xscale_be index 8597aa208..462320f66 100644 --- a/configure/os/CONFIG.Common.linux-xscale_be +++ b/configure/os/CONFIG.Common.linux-xscale_be @@ -15,5 +15,14 @@ ARCH_CLASS = xscale ifeq ($(BUILD_CLASS),CROSS) VALID_BUILDS = Ioc GNU_TARGET = xscale_be - CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET)) + CMPLR_PREFIX = $(GNU_TARGET:%=%-) + + # Configure for readline if requested + OP_SYS_INCLUDES += $(READLINE_DIR:%=-I%/include) + READLINE_LDFLAGS = $(READLINE_DIR:%=-L%/lib) + RUNTIME_LDFLAGS_READLINE_YES_NO = $(READLINE_DIR:%=-Wl,-rpath,%/lib) + RUNTIME_LDFLAGS += \ + $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)_$(STATIC_BUILD)) + SHRLIBDIR_LDFLAGS += $(READLINE_LDFLAGS) + PRODDIR_LDFLAGS += $(READLINE_LDFLAGS) endif diff --git a/configure/os/CONFIG_SITE.Common.linux-xscale_be b/configure/os/CONFIG_SITE.Common.linux-xscale_be index 69efd6ffa..015229647 100644 --- a/configure/os/CONFIG_SITE.Common.linux-xscale_be +++ b/configure/os/CONFIG_SITE.Common.linux-xscale_be @@ -1,10 +1,4 @@ # CONFIG_SITE.Common.linux-xscale_be # -# Site specific definitions for linux-xscale_be target builds. +# Site specific definitions for all linux-xscale_be target builds. #------------------------------------------------------- - -# Set GNU_DIR to point to directory containing the tool-chain - -# APS: -GNU_DIR = /usr/local/vw/xscale_be - diff --git a/configure/os/CONFIG_SITE.linux-x86.linux-xscale_be b/configure/os/CONFIG_SITE.linux-x86.linux-xscale_be new file mode 100644 index 000000000..6df78db19 --- /dev/null +++ b/configure/os/CONFIG_SITE.linux-x86.linux-xscale_be @@ -0,0 +1,11 @@ +# CONFIG_SITE.linux-x86.linux-xscale_be +# +# Site specific definitions for linux-x86 host - linux-xscale_be targets +#------------------------------------------------------- + +# Set GNU_DIR to point to directory containing the tool-chain +GNU_DIR = /usr/local/vw/xscale_be + +# If readline is available, configure it +READLINE_DIR = $(GNU_DIR)/target/usr +COMMANDLINE_LIBRARY = READLINE diff --git a/configure/os/CONFIG_SITE.linux-x86_64.linux-xscale_be b/configure/os/CONFIG_SITE.linux-x86_64.linux-xscale_be new file mode 100644 index 000000000..d016ce985 --- /dev/null +++ b/configure/os/CONFIG_SITE.linux-x86_64.linux-xscale_be @@ -0,0 +1,7 @@ +# CONFIG_SITE.linux-x86_64.linux-xscale_be +# +# Site specific settings for linux-x86_64 host - linux-xscale_be target +#------------------------------------------------------- + +# Inherit setting from linux-x86 +include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-xscale_be