From d014ea6ccc8767cec7c17538cf830d35ad7deb60 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 19 Jan 2017 19:31:00 +0900 Subject: [PATCH] Build: strip trailing slashes from directory paths more simply Append . then strip /. seems clumsy. Just use $(patsubst %/,%, ). Signed-off-by: Masahiro Yamada --- make_helpers/build_macros.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk index 24d5924ea7..2312d2c920 100644 --- a/make_helpers/build_macros.mk +++ b/make_helpers/build_macros.mk @@ -300,9 +300,8 @@ define MAKE_BL # ordering is not relevant but sort removes duplicates. $(eval TEMP_OBJ_DIRS := $(sort $(BUILD_DIR)/ $(dir ${OBJS} ${LINKERFILE}))) # The $(dir ) function leaves a trailing / on the directory names - # We append a . then strip /. from each, to remove the trailing / characters - # This gives names suitable for use as make rule targets. - $(eval OBJ_DIRS := $(subst /.,,$(addsuffix .,$(TEMP_OBJ_DIRS)))) + # Rip off the / to match directory names with make rule targets. + $(eval OBJ_DIRS := $(patsubst %/,%,$(TEMP_OBJ_DIRS))) # Create generators for object directory structure