r269557 - MSVCToolChain.cpp: Make version.dll generic for win32.

NAKAMURA Takumi via cfe-commits cfe-commits at lists.llvm.org
Sat May 14 01:12:37 PDT 2016


Author: chapuni
Date: Sat May 14 03:12:37 2016
New Revision: 269557

URL: http://llvm.org/viewvc/llvm-project?rev=269557&view=rev
Log:
MSVCToolChain.cpp: Make version.dll generic for win32.

We may consider msvc features may be capable on mingw host, if it can.
Consider --host=mingw --target=msvc.

Modified:
    cfe/trunk/lib/Driver/CMakeLists.txt
    cfe/trunk/lib/Driver/MSVCToolChain.cpp

Modified: cfe/trunk/lib/Driver/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/CMakeLists.txt?rev=269557&r1=269556&r2=269557&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/CMakeLists.txt (original)
+++ cfe/trunk/lib/Driver/CMakeLists.txt Sat May 14 03:12:37 2016
@@ -3,6 +3,11 @@ set(LLVM_LINK_COMPONENTS
   Support
   )
 
+if(WIN32)
+  # MSVCToolChain.cpp uses version.dll.
+  set(system_libs version)
+endif()
+
 add_clang_library(clangDriver
   Action.cpp
   Compilation.cpp
@@ -26,4 +31,5 @@ add_clang_library(clangDriver
 
   LINK_LIBS
   clangBasic
+  ${system_libs}
   )

Modified: cfe/trunk/lib/Driver/MSVCToolChain.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/MSVCToolChain.cpp?rev=269557&r1=269556&r2=269557&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/MSVCToolChain.cpp (original)
+++ cfe/trunk/lib/Driver/MSVCToolChain.cpp Sat May 14 03:12:37 2016
@@ -38,8 +38,6 @@
     #define NOMINMAX
   #endif
   #include <windows.h>
-
-  #pragma comment(lib, "version.lib")
 #endif
 
 using namespace clang::driver;




More information about the cfe-commits mailing list