From e61792fc978f9b8a9c790be468fbf97828ac8ae9 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sun, 24 Jul 2022 07:07:29 -0700
Subject: [PATCH] Avoid hardcoded build time paths in the output binaries

replace the compile definitions with the output locations.

Upstream-Status: Inappropriate [would need reworking somehow to be acceptable upstream]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 support/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/support/Makefile b/support/Makefile
index 917a858bd1..17a747c8c7 100644
--- a/support/Makefile
+++ b/support/Makefile
@@ -227,9 +227,9 @@ libsupport-inhibit-o += .o
 endif
 
 CFLAGS-support_paths.c = \
-		-DSRCDIR_PATH=\"`cd .. ; pwd`\" \
-		-DOBJDIR_PATH=\"`cd $(objpfx)/..; pwd`\" \
-		-DOBJDIR_ELF_LDSO_PATH=\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-name)\" \
+		-DSRCDIR_PATH=\"$(oe_srcdir)\" \
+		-DOBJDIR_PATH=\"$(libdir)/glibc-tests/ptest/tests/glibc-ptest\" \
+		-DOBJDIR_ELF_LDSO_PATH=\"$(slibdir)/$(rtld-installed-name)\" \
 		-DINSTDIR_PATH=\"$(prefix)\" \
 		-DLIBDIR_PATH=\"$(libdir)\" \
 		-DBINDIR_PATH=\"$(bindir)\" \
