[PATCH] D34521: Remove /nologo from windows build

[Ekaterina Vaartis via Phabricator via llvm-commits]

TyanNN created this revision.
Herald added a subscriber: mgorny.

`/nologo` emits error on new versions of rc.exe
PR#33493


https://reviews.llvm.org/D34521

Files:
  cmake/modules/AddLLVM.cmake


Index: cmake/modules/AddLLVM.cmake
===================================================================
--- cmake/modules/AddLLVM.cmake
+++ cmake/modules/AddLLVM.cmake
@@ -300,7 +300,7 @@
   endif()
 
   set_property(SOURCE ${resource_file}
-               PROPERTY COMPILE_FLAGS /nologo)
+               PROPERTY COMPILE_FLAGS)
   set_property(SOURCE ${resource_file}
                PROPERTY COMPILE_DEFINITIONS
                "RC_VERSION_FIELD_1=${ARG_VERSION_MAJOR}"
@@ -672,7 +672,7 @@
     # it forces Xcode to properly link the static library.
     list(APPEND ALL_FILES "${LLVM_MAIN_SRC_DIR}/cmake/dummy.cpp")
   endif()
-  
+
   if( EXCLUDE_FROM_ALL )
     add_executable(${name} EXCLUDE_FROM_ALL ${ALL_FILES})
   else()
@@ -1328,7 +1328,7 @@
   # magic. First we grab one of the types, and a type-specific path. Then from
   # the type-specific path we find the last occurrence of the type in the path,
   # and replace it with CMAKE_CFG_INTDIR. This allows the build step to be type
-  # agnostic again. 
+  # agnostic again.
   if(NOT ARG_OUTPUT_DIR)
     # If you're not overriding the OUTPUT_DIR, we can make the link relative in
     # the same directory.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D34521.103604.patch
Type: text/x-patch
Size: 1171 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170622/4bb17ad0/attachment.bin>