123456789101112131415161718192021222324252627282930313233 |
- From 7111770e8290082530d920e120995bf81431b0aa Mon Sep 17 00:00:00 2001
- From: Martin Kelly <mkelly@xevo.com>
- Date: Fri, 19 May 2017 00:22:57 -0700
- Subject: [PATCH 12/18] llvm: allow env override of exe path
- When using a native llvm-config from inside a sysroot, we need llvm-config to
- return the libraries, include directories, etc. from inside the sysroot rather
- than from the native sysroot. Thus provide an env override for calling
- llvm-config from a target sysroot.
- Upstream-Status: Inappropriate [oe-core specific]
- Signed-off-by: Martin Kelly <mkelly@xevo.com>
- Signed-off-by: Khem Raj <raj.khem@gmail.com>
- ---
- llvm/tools/llvm-config/llvm-config.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
- --- a/llvm/tools/llvm-config/llvm-config.cpp
- +++ b/llvm/tools/llvm-config/llvm-config.cpp
- @@ -226,6 +226,13 @@ Typical components:\n\
-
- /// Compute the path to the main executable.
- std::string GetExecutablePath(const char *Argv0) {
- + // Hack for Yocto: we need to override the root path when we are using
- + // llvm-config from within a target sysroot.
- + const char *Sysroot = std::getenv("YOCTO_ALTERNATE_EXE_PATH");
- + if (Sysroot != nullptr) {
- + return Sysroot;
- + }
- +
- // This just needs to be some symbol in the binary; C++ doesn't
- // allow taking the address of ::main however.
- void *P = (void *)(intptr_t)GetExecutablePath;
|