[llvm] r198156 - Windows build fixes, hopefully last part.

Nico Weber nicolasweber at gmx.de
Sat Dec 28 22:56:28 PST 2013


Author: nico
Date: Sun Dec 29 00:56:28 2013
New Revision: 198156

URL: http://llvm.org/viewvc/llvm-project?rev=198156&view=rev
Log:
Windows build fixes, hopefully last part.

r198153 fixed the msvs bot problem, but broke a msysgit bot. This change
hopefully makes both variants happy.

Modified:
    llvm/trunk/cmake/modules/AddLLVM.cmake

Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=198156&r1=198155&r2=198156&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Sun Dec 29 00:56:28 2013
@@ -44,8 +44,13 @@ function(add_llvm_symbol_exports target_
       DEPENDS ${export_file}
       VERBATIM
       COMMENT "Creating export file for ${target_name}")
-    set_property(TARGET ${target_name} APPEND_STRING PROPERTY
-                 LINK_FLAGS "/DEF:${CMAKE_CURRENT_BINARY_DIR}/symbol.def")
+    if(CYGWIN)
+      set_property(TARGET ${target_name} APPEND_STRING PROPERTY
+                   LINK_FLAGS "${CMAKE_CURRENT_BINARY_DIR}/symbol.def")
+    else()
+      set_property(TARGET ${target_name} APPEND_STRING PROPERTY
+                   LINK_FLAGS "/DEF:${CMAKE_CURRENT_BINARY_DIR}/symbol.def")
+    endif()
   endif()
 
   add_custom_target(${target_name}_exports DEPENDS ${native_export_file})





More information about the llvm-commits mailing list