1Upstream-Status: Pending 2Signed-off-by: Khem Raj <raj.khem@gmail.com> 3 4From 61b00e1e051e367f5483d7b5253b6c85a9e8a90f Mon Sep 17 00:00:00 2001 5From: Martin Kelly <mkelly@xevo.com> 6Date: Fri, 19 May 2017 00:22:57 -0700 7Subject: [PATCH] llvm: allow env override of exe path 8 9When using a native llvm-config from inside a sysroot, we need llvm-config to 10return the libraries, include directories, etc. from inside the sysroot rather 11than from the native sysroot. Thus provide an env override for calling 12llvm-config from a target sysroot. 13 14Signed-off-by: Martin Kelly <mkelly@xevo.com> 15Signed-off-by: Khem Raj <raj.khem@gmail.com> 16--- 17 llvm/tools/llvm-config/llvm-config.cpp | 7 +++++++ 18 1 file changed, 7 insertions(+) 19 20diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp 21index 7ef7c46a262..a4f7ed82c7b 100644 22--- a/llvm/tools/llvm-config/llvm-config.cpp 23+++ b/llvm/tools/llvm-config/llvm-config.cpp 24@@ -225,6 +225,13 @@ Typical components:\n\ 25 26 /// Compute the path to the main executable. 27 std::string GetExecutablePath(const char *Argv0) { 28+ // Hack for Yocto: we need to override the root path when we are using 29+ // llvm-config from within a target sysroot. 30+ const char *Sysroot = std::getenv("YOCTO_ALTERNATE_EXE_PATH"); 31+ if (Sysroot != nullptr) { 32+ return Sysroot; 33+ } 34+ 35 // This just needs to be some symbol in the binary; C++ doesn't 36 // allow taking the address of ::main however. 37 void *P = (void *)(intptr_t)GetExecutablePath; 38