[llvm] r304458 - [llvm-config] Report --bindir based on LLVM_TOOLS_INSTALL_DIR

[Keno Fischer via llvm-commits]

Thanks for letting me know. Should be fixed in r304468, I hope.

On Thu, Jun 1, 2017 at 4:43 PM, Galina Kistanova <gkistanova at gmail.com>
wrote:

> Hello Keno,
>
> This commit broke a build on one of our builders:
>
> http://lab.llvm.org:8011/builders/llvm-clang-x86_64-
> expensive-checks-win/builds/2856
>
> Please have a look at this?
>
> Thanks
>
> Galina
>
>
>
> On Thu, Jun 1, 2017 at 12:20 PM, Keno Fischer via llvm-commits <
> llvm-commits at lists.llvm.org> wrote:
>
>> Author: kfischer
>> Date: Thu Jun  1 14:20:33 2017
>> New Revision: 304458
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=304458&view=rev
>> Log:
>> [llvm-config] Report --bindir based on LLVM_TOOLS_INSTALL_DIR
>>
>> Summary:
>> `LLVM_TOOLS_INSTALL_DIR` was introduced in r272200 in order to override
>> the directory
>> name into which to install LLVM's executable. However, `llvm-config
>> --bindir` still reported
>> `$PREFIX/bin` independent of what LLVM_TOOLS_INSTALL_DIR was set to.
>>
>> This fixes the out-of-tree clang standalone build for me.
>>
>> Reviewers: beanz, tstellar
>>
>> Reviewed By: tstellar
>>
>> Subscribers: chapuni, tstellar, llvm-commits
>>
>> Differential Revision: https://reviews.llvm.org/D22499
>>
>> Modified:
>>     llvm/trunk/tools/llvm-config/BuildVariables.inc.in
>>     llvm/trunk/tools/llvm-config/llvm-config.cpp
>>
>> Modified: llvm/trunk/tools/llvm-config/BuildVariables.inc.in
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-co
>> nfig/BuildVariables.inc.in?rev=304458&r1=304457&r2=304458&view=diff
>> ============================================================
>> ==================
>> --- llvm/trunk/tools/llvm-config/BuildVariables.inc.in (original)
>> +++ llvm/trunk/tools/llvm-config/BuildVariables.inc.in Thu Jun  1
>> 14:20:33 2017
>> @@ -34,3 +34,4 @@
>>  #define LLVM_DYLIB_COMPONENTS "@LLVM_DYLIB_COMPONENTS@"
>>  #define LLVM_DYLIB_VERSION "@LLVM_DYLIB_VERSION@"
>>  #define LLVM_HAS_GLOBAL_ISEL @LLVM_HAS_GLOBAL_ISEL@
>> +#define LLVM_TOOLS_INSTALL_DIR "@LLVM_TOOLS_INSTALL_DIR@"
>>
>> Modified: llvm/trunk/tools/llvm-config/llvm-config.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-co
>> nfig/llvm-config.cpp?rev=304458&r1=304457&r2=304458&view=diff
>> ============================================================
>> ==================
>> --- llvm/trunk/tools/llvm-config/llvm-config.cpp (original)
>> +++ llvm/trunk/tools/llvm-config/llvm-config.cpp Thu Jun  1 14:20:33 2017
>> @@ -333,7 +333,9 @@ int main(int argc, char **argv) {
>>    } else {
>>      ActivePrefix = CurrentExecPrefix;
>>      ActiveIncludeDir = ActivePrefix + "/include";
>> -    ActiveBinDir = ActivePrefix + "/bin";
>> +    SmallString<PATH_MAX> path(StringRef(LLVM_TOOLS_INSTALL_DIR));
>> +    sys::fs::make_absolute(ActivePrefix, path);
>> +    ActiveBinDir = path.str();
>>      ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX;
>>      ActiveCMakeDir = ActiveLibDir + "/cmake/llvm";
>>      ActiveIncludeOption = "-I" + ActiveIncludeDir;
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170601/7599dc29/attachment.html>