From 690dd80d07b3c807547df63337ed658d0fdf3b40 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Thu, 27 Aug 2020 09:42:00 +0200 Subject: pre/toolchain: swap order of the prefix-map It seem that the last argument is checked first, so put the more specific substitution first. Signed-off-by: Michael Olbrich --- rules/pre/toolchain.make | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/pre/toolchain.make b/rules/pre/toolchain.make index a6a21e3..c7c3d97 100644 --- a/rules/pre/toolchain.make +++ b/rules/pre/toolchain.make @@ -49,13 +49,13 @@ PTXDIST_HOST_LDFLAGS := -L${PTXDIST_PATH_SYSROOT_HOST_PREFIX}/lib ifndef PTXCONF_TOOLCHAIN_DEBUG TOOLCHAIN_CROSS_DEBUG_MAP := \ - $(PTXDIST_SYSROOT_CROSS)= \ - $(PTXDIST_WORKSPACE)/platform-=$(call remove_quotes,$(PTXCONF_PROJECT))/platform- + $(PTXDIST_WORKSPACE)/platform-=$(call remove_quotes,$(PTXCONF_PROJECT))/platform- \ + $(PTXDIST_SYSROOT_CROSS)= ifneq ($(PTXDIST_SYSROOT_CROSS),$(call ptx/sh, realpath $(PTXDIST_SYSROOT_CROSS))) TOOLCHAIN_CROSS_DEBUG_MAP += \ - $(call ptx/sh, realpath $(PTXDIST_SYSROOT_CROSS))= \ - $(call ptx/sh, realpath $(PTXDIST_WORKSPACE))/platform-=$(call remove_quotes,$(PTXCONF_PROJECT))/platform- + $(call ptx/sh, realpath $(PTXDIST_WORKSPACE))/platform-=$(call remove_quotes,$(PTXCONF_PROJECT))/platform- \ + $(call ptx/sh, realpath $(PTXDIST_SYSROOT_CROSS))= endif PTXDIST_HOST_CPPFLAGS := \ -- cgit v1.2.3