[llvm] r288959 - [CMake] Use cmakedefine01 instead of cmakedefine

Wed Dec 7 13:13:21 PST 2016

See r288963 :-)

-Chris

> On Dec 7, 2016, at 1:12 PM, Matthias Braun <mbraun at apple.com> wrote:
> 
> Why not simply change
> 
> #if defined (__APPLE__) && HAVE_CRASHREPORTERCLIENT_H
> to
> #if define (__APPLE__) && defined(HAVE_CRASHREPORTERCLIENT_H)
> 
> in PrettyStackTrace.cpp?
> 
> In my experience relying on 0/1 does not work because people like to write
> #ifdef/#ifndef and will be very surprised that #ifdef BLA works even if BLA is zero...
> 
> - Matthias
> 
>> On Dec 7, 2016, at 1:05 PM, Chris Bieneman via llvm-commits <llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>> wrote:
>> 
>> Yes, I had a followup patch that fixes it.
>> 
>> -Chris
>> 
>>> On Dec 7, 2016, at 12:43 PM, Mike Aizatsky <aizatsky at google.com <mailto:aizatsky at google.com>> wrote:
>>> 
>>> Chris,
>>> 
>>> I think this breaks the bot:
>>> 
>>> http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/1219/steps/build%20clang%2Fmsan/logs/stdio <http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/1219/steps/build%20clang%2Fmsan/logs/stdio>
>>> 
>>> FAILED: lib/Support/CMakeFiles/LLVMSupport.dir/PrettyStackTrace.cpp.o 
>>> /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm_build0/bin/clang++   -DGTEST_HAS_RTTI=0 -D_DEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -Ilib/Support -I/mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/lib/Support -Iinclude -I/mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/include -nostdinc++ -isystem /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/libcxx_build_msan/include -isystem /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/libcxx_build_msan/include/c++/v1  -lc++abi -Wl,--rpath=/mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/libcxx_build_msan/lib -L/mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/libcxx_build_msan/lib -fsanitize=memory -w -stdlib=libc++ -fPIC -fvisibility-inlines-hidden -Wall -W -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -pedantic -Wno-long-long -Wcovered-switch-default -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Werror=date-time -std=c++11 -fno-omit-frame-pointer -gline-tables-only -fsanitize=memory -fcolor-diagnostics -ffunction-sections -fdata-sections -O3    -UNDEBUG  -fno-exceptions -fno-rtti -MMD -MT lib/Support/CMakeFiles/LLVMSupport.dir/PrettyStackTrace.cpp.o -MF lib/Support/CMakeFiles/LLVMSupport.dir/PrettyStackTrace.cpp.o.d -o lib/Support/CMakeFiles/LLVMSupport.dir/PrettyStackTrace.cpp.o -c /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/lib/Support/PrettyStackTrace.cpp
>>> /mnt/b/sanitizer-buildbot3/sanitizer-x86_64-linux-fast/build/llvm/lib/Support/PrettyStackTrace.cpp:27:10: fatal error: 'CrashReporterClient.h' file not found
>>> #include <CrashReporterClient.h>
>>>          ^~~~~~~~~~~~~~~~~~~~~~~
>>> 1 error generated.
>>> 
>>> 
>>> On Wed, Dec 7, 2016 at 11:23 AM Chris Bieneman via llvm-commits <llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>> wrote:
>>> Author: cbieneman
>>> Date: Wed Dec  7 13:13:32 2016
>>> New Revision: 288959
>>> 
>>> URL: http://llvm.org/viewvc/llvm-project?rev=288959&view=rev <http://llvm.org/viewvc/llvm-project?rev=288959&view=rev>
>>> Log:
>>> [CMake] Use cmakedefine01 instead of cmakedefine
>>> 
>>> Looks like we need a 01 value for HAVE_CRASHREPORTERCLIENT_H.
>>> 
>>> Modified:
>>>     llvm/trunk/include/llvm/Config/config.h.cmake
>>> 
>>> Modified: llvm/trunk/include/llvm/Config/config.h.cmake
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/config.h.cmake?rev=288959&r1=288958&r2=288959&view=diff <http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/config.h.cmake?rev=288959&r1=288958&r2=288959&view=diff>
>>> ==============================================================================
>>> --- llvm/trunk/include/llvm/Config/config.h.cmake (original)
>>> +++ llvm/trunk/include/llvm/Config/config.h.cmake Wed Dec  7 13:13:32 2016
>>> @@ -17,7 +17,7 @@
>>>  #cmakedefine HAVE_BACKTRACE ${HAVE_BACKTRACE}
>>> 
>>>  /* Define to 1 if you have the <CrashReporterClient.h> header file. */
>>> -#cmakedefine HAVE_CRASHREPORTERCLIENT_H
>>> +#cmakedefine01 HAVE_CRASHREPORTERCLIENT_H
>>> 
>>>  /* can use __crashreporter_info__ */
>>>  #undef HAVE_CRASHREPORTER_INFO
>>> 
>>> 
>>> _______________________________________________
>>> llvm-commits mailing list
>>> llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>
>>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits <http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits>
>>> -- 
>>> Mike
>>> Sent from phone
>> 
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at lists.llvm.org <mailto: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/20161207/c57b9b2f/attachment.html>