From b993e29fad663193e356594b9cb68f37fc75dc5a Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 7 Aug 2012 09:41:21 -0500 Subject: [PATCH] configure: Minor fixes Don't add extraneous characters when SHRLIB_VERSION or GNU_TARGET are empty. The addprefix or addsuffix functions only include the prefix/suffix part if the list argument is not empty. This fixes issues naming libCap5.so at build-time. --- configure/os/CONFIG.Common.UnixCommon | 4 ++-- configure/os/CONFIG.Common.linux-arm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure/os/CONFIG.Common.UnixCommon b/configure/os/CONFIG.Common.UnixCommon index 24f9a6d9a..eba3ab973 100644 --- a/configure/os/CONFIG.Common.UnixCommon +++ b/configure/os/CONFIG.Common.UnixCommon @@ -20,8 +20,8 @@ OBJ = .o LIB_PREFIX = lib LIB_SUFFIX = .a SHRLIB_SUFFIX_BASE = .so -SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE).$(SHRLIB_VERSION) -LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE).$(LOADABLE_SHRLIB_VERSION) +SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(SHRLIB_VERSION)) +LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(LOADABLE_SHRLIB_VERSION)) LOADABLE_SHRLIB_PREFIX = lib #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.linux-arm b/configure/os/CONFIG.Common.linux-arm index 7ccb1bbad..15dad9e9e 100644 --- a/configure/os/CONFIG.Common.linux-arm +++ b/configure/os/CONFIG.Common.linux-arm @@ -17,7 +17,7 @@ ifeq ($(BUILD_CLASS),CROSS) # prefix of compiler tools CMPLR_SUFFIX = - CMPLR_PREFIX = $(GNU_TARGET)- + CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET)) # Provide a link-time path for shared libraries SHRLIBDIR_RPATH_LDFLAGS_YES += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)