<div dir="ltr">Hello Keno,<br><br>This commit broke a build on one of our builders:<br><br><a href="http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/2856">http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/2856</a><br><br>Please have a look at this?<br><br>Thanks<br><br>Galina<br><br><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Jun 1, 2017 at 12:20 PM, Keno Fischer via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: kfischer<br>
Date: Thu Jun  1 14:20:33 2017<br>
New Revision: 304458<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=304458&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=304458&view=rev</a><br>
Log:<br>
[llvm-config] Report --bindir based on LLVM_TOOLS_INSTALL_DIR<br>
<br>
Summary:<br>
`LLVM_TOOLS_INSTALL_DIR` was introduced in r272200 in order to override the directory<br>
name into which to install LLVM's executable. However, `llvm-config --bindir` still reported<br>
`$PREFIX/bin` independent of what LLVM_TOOLS_INSTALL_DIR was set to.<br>
<br>
This fixes the out-of-tree clang standalone build for me.<br>
<br>
Reviewers: beanz, tstellar<br>
<br>
Reviewed By: tstellar<br>
<br>
Subscribers: chapuni, tstellar, llvm-commits<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D22499" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D22499</a><br>
<br>
Modified:<br>
    llvm/trunk/tools/llvm-config/<a href="http://BuildVariables.inc.in" rel="noreferrer" target="_blank">B<wbr>uildVariables.inc.in</a><br>
    llvm/trunk/tools/llvm-config/<wbr>llvm-config.cpp<br>
<br>
Modified: llvm/trunk/tools/llvm-config/<a href="http://BuildVariables.inc.in" rel="noreferrer" target="_blank">B<wbr>uildVariables.inc.in</a><br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/BuildVariables.inc.in?rev=304458&r1=304457&r2=304458&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/tools/llvm-<wbr>config/BuildVariables.inc.in?<wbr>rev=304458&r1=304457&r2=<wbr>304458&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/tools/llvm-config/<a href="http://BuildVariables.inc.in" rel="noreferrer" target="_blank">B<wbr>uildVariables.inc.in</a> (original)<br>
+++ llvm/trunk/tools/llvm-config/<a href="http://BuildVariables.inc.in" rel="noreferrer" target="_blank">B<wbr>uildVariables.inc.in</a> Thu Jun  1 14:20:33 2017<br>
@@ -34,3 +34,4 @@<br>
 #define LLVM_DYLIB_COMPONENTS "@LLVM_DYLIB_COMPONENTS@"<br>
 #define LLVM_DYLIB_VERSION "@LLVM_DYLIB_VERSION@"<br>
 #define LLVM_HAS_GLOBAL_ISEL @LLVM_HAS_GLOBAL_ISEL@<br>
+#define LLVM_TOOLS_INSTALL_DIR "@LLVM_TOOLS_INSTALL_DIR@"<br>
<br>
Modified: llvm/trunk/tools/llvm-config/<wbr>llvm-config.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/llvm-config.cpp?rev=304458&r1=304457&r2=304458&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/tools/llvm-<wbr>config/llvm-config.cpp?rev=<wbr>304458&r1=304457&r2=304458&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/tools/llvm-config/<wbr>llvm-config.cpp (original)<br>
+++ llvm/trunk/tools/llvm-config/<wbr>llvm-config.cpp Thu Jun  1 14:20:33 2017<br>
@@ -333,7 +333,9 @@ int main(int argc, char **argv) {<br>
   } else {<br>
     ActivePrefix = CurrentExecPrefix;<br>
     ActiveIncludeDir = ActivePrefix + "/include";<br>
-    ActiveBinDir = ActivePrefix + "/bin";<br>
+    SmallString<PATH_MAX> path(StringRef(LLVM_TOOLS_<wbr>INSTALL_DIR));<br>
+    sys::fs::make_absolute(<wbr>ActivePrefix, path);<br>
+    ActiveBinDir = path.str();<br>
     ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX;<br>
     ActiveCMakeDir = ActiveLibDir + "/cmake/llvm";<br>
     ActiveIncludeOption = "-I" + ActiveIncludeDir;<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>