Author: hans Date: Thu Jul 23 11:14:09 2015 New Revision: 243023 URL: http://llvm.org/viewvc/llvm-project?rev=243023&view=rev Log: Merging r242993: ------------------------------------------------------------------------ r242993 | yrnkrn | 2015-07-23 01:06:12 -0700 (Thu, 23 Jul 2015) | 11 lines
Avoid using -Wl,-z,defs on Cygwin. Prior to CMAKE 2.8.4 that was covered by the WIN32 conditional but from 2.8.4 CMAKE no longer defined WIN32 when running under Cygwin and it needs its own test. Patch by Martell Malone! http://reviews.llvm.org/D11347 ------------------------------------------------------------------------ Modified: llvm/branches/release_37/ (props changed) llvm/branches/release_37/cmake/modules/HandleLLVMOptions.cmake Propchange: llvm/branches/release_37/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 23 11:14:09 2015 @@ -1,3 +1,3 @@ /llvm/branches/Apple/Pertwee:110850,110961 /llvm/branches/type-system-rewrite:133420-134817 -/llvm/trunk:155241,242236,242239,242281,242288,242296,242331,242341,242410,242412,242433-242434,242442,242543,242673,242680,242706,242721-242722,242733-242735,242742,242869,242919 +/llvm/trunk:155241,242236,242239,242281,242288,242296,242331,242341,242410,242412,242433-242434,242442,242543,242673,242680,242706,242721-242722,242733-242735,242742,242869,242919,242993 Modified: llvm/branches/release_37/cmake/modules/HandleLLVMOptions.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_37/cmake/modules/HandleLLVMOptions.cmake?rev=243023&r1=243022&r2=243023&view=diff ============================================================================== --- llvm/branches/release_37/cmake/modules/HandleLLVMOptions.cmake (original) +++ llvm/branches/release_37/cmake/modules/HandleLLVMOptions.cmake Thu Jul 23 11:14:09 2015 @@ -131,7 +131,7 @@ endif() # Pass -Wl,-z,defs. This makes sure all symbols are defined. Otherwise a DSO # build might work on ELF but fail on MachO/COFF. -if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR +if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR CYGWIN OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") AND NOT LLVM_USE_SANITIZER) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs") _______________________________________________ llvm-branch-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/llvm-branch-commits
