[llvm] r244232 - [cmake] Handle Dragonfly BSD like FreeBSD

[Hans Wennborg via llvm-commits]

Chandler: ping?

The follow-up patch r244659 (which I would also merge) makes this look
pretty trivial.

On Tue, Aug 11, 2015 at 9:15 AM, Hans Wennborg <hans at chromium.org> wrote:
> We should probably merge this to 3.7.
>
> Chandler: you're listed as the CMake owner. OK to merge?
>
> On Thu, Aug 6, 2015 at 10:17 AM, Reid Kleckner via llvm-commits
> <llvm-commits at lists.llvm.org> wrote:
>> Author: rnk
>> Date: Thu Aug  6 12:17:44 2015
>> New Revision: 244232
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=244232&view=rev
>> Log:
>> [cmake] Handle Dragonfly BSD like FreeBSD
>>
>> Fixes build break reported in PR24358.
>>
>> Patch by John Marino.
>>
>> Modified:
>>     llvm/trunk/CMakeLists.txt
>>
>> Modified: llvm/trunk/CMakeLists.txt
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=244232&r1=244231&r2=244232&view=diff
>> ==============================================================================
>> --- llvm/trunk/CMakeLists.txt (original)
>> +++ llvm/trunk/CMakeLists.txt Thu Aug  6 12:17:44 2015
>> @@ -518,7 +518,7 @@ if (APPLE)
>>  else(UNIX)
>>    if(NOT DEFINED CMAKE_INSTALL_RPATH)
>>      set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}")
>> -    if (${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
>> +    if (${CMAKE_SYSTEM_NAME} MATCHES FreeBSD OR ${CMAKE_SYSTEM_NAME} MATCHES DragonFly)
>>        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,origin")
>>        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,origin")
>>      endif()
>> @@ -544,12 +544,12 @@ if(LLVM_USE_HOST_TOOLS)
>>    include(CrossCompile)
>>  endif(LLVM_USE_HOST_TOOLS)
>>
>> -if( ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD )
>> +if( ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD OR ${CMAKE_SYSTEM_NAME} MATCHES DragonFly )
>>    # On FreeBSD, /usr/local/* is not used by default. In order to build LLVM
>>    # with libxml2, iconv.h, etc., we must add /usr/local paths.
>>    include_directories("/usr/local/include")
>>    link_directories("/usr/local/lib")
>> -endif( ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD )
>> +endif( ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD OR ${CMAKE_SYSTEM_NAME} MATCHES DragonFly )
>>
>>  if( ${CMAKE_SYSTEM_NAME} MATCHES SunOS )
>>     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include llvm/Support/Solaris.h")
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits