<p dir="ltr">Sorry, missed your email. Approved.</p>
<br><div class="gmail_quote"><div dir="ltr">On Fri, Aug 14, 2015, 11:27 Hans Wennborg <<a href="mailto:hans@chromium.org">hans@chromium.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Chandler: ping?<br>
<br>
The follow-up patch r244659 (which I would also merge) makes this look<br>
pretty trivial.<br>
<br>
On Tue, Aug 11, 2015 at 9:15 AM, Hans Wennborg <<a href="mailto:hans@chromium.org" target="_blank">hans@chromium.org</a>> wrote:<br>
> We should probably merge this to 3.7.<br>
><br>
> Chandler: you're listed as the CMake owner. OK to merge?<br>
><br>
> On Thu, Aug 6, 2015 at 10:17 AM, Reid Kleckner via llvm-commits<br>
> <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br>
>> Author: rnk<br>
>> Date: Thu Aug  6 12:17:44 2015<br>
>> New Revision: 244232<br>
>><br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=244232&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=244232&view=rev</a><br>
>> Log:<br>
>> [cmake] Handle Dragonfly BSD like FreeBSD<br>
>><br>
>> Fixes build break reported in PR24358.<br>
>><br>
>> Patch by John Marino.<br>
>><br>
>> Modified:<br>
>>     llvm/trunk/CMakeLists.txt<br>
>><br>
>> Modified: llvm/trunk/CMakeLists.txt<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=244232&r1=244231&r2=244232&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=244232&r1=244231&r2=244232&view=diff</a><br>
>> ==============================================================================<br>
>> --- llvm/trunk/CMakeLists.txt (original)<br>
>> +++ llvm/trunk/CMakeLists.txt Thu Aug  6 12:17:44 2015<br>
>> @@ -518,7 +518,7 @@ if (APPLE)<br>
>>  else(UNIX)<br>
>>    if(NOT DEFINED CMAKE_INSTALL_RPATH)<br>
>>      set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}")<br>
>> -    if (${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)<br>
>> +    if (${CMAKE_SYSTEM_NAME} MATCHES FreeBSD OR ${CMAKE_SYSTEM_NAME} MATCHES DragonFly)<br>
>>        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,origin")<br>
>>        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,origin")<br>
>>      endif()<br>
>> @@ -544,12 +544,12 @@ if(LLVM_USE_HOST_TOOLS)<br>
>>    include(CrossCompile)<br>
>>  endif(LLVM_USE_HOST_TOOLS)<br>
>><br>
>> -if( ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD )<br>
>> +if( ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD OR ${CMAKE_SYSTEM_NAME} MATCHES DragonFly )<br>
>>    # On FreeBSD, /usr/local/* is not used by default. In order to build LLVM<br>
>>    # with libxml2, iconv.h, etc., we must add /usr/local paths.<br>
>>    include_directories("/usr/local/include")<br>
>>    link_directories("/usr/local/lib")<br>
>> -endif( ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD )<br>
>> +endif( ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD OR ${CMAKE_SYSTEM_NAME} MATCHES DragonFly )<br>
>><br>
>>  if( ${CMAKE_SYSTEM_NAME} MATCHES SunOS )<br>
>>     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include llvm/Support/Solaris.h")<br>
>><br>
>><br>
>> _______________________________________________<br>
>> llvm-commits mailing list<br>
>> <a href="mailto:llvm-commits@lists.llvm.org" target="_blank">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/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>