0007-llvm-allow-env-override-of-exe-path.patch 1.5 KB

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