summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNAKAMURA Takumi <geek4civic@gmail.com>2016-05-14 08:12:37 +0000
committerNAKAMURA Takumi <geek4civic@gmail.com>2016-05-14 08:12:37 +0000
commit2326f79a60e4995e0eb402f0e1198fc10187a499 (patch)
tree4ebcc55a945fba9fcc78bbd065efe7b5a8e9e237
parent4b8e3e59cddba554f88a63e4b1768707ee64bdd6 (diff)
downloadbcm5719-llvm-2326f79a60e4995e0eb402f0e1198fc10187a499.tar.gz
bcm5719-llvm-2326f79a60e4995e0eb402f0e1198fc10187a499.zip
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. llvm-svn: 269557
-rw-r--r--clang/lib/Driver/CMakeLists.txt6
-rw-r--r--clang/lib/Driver/MSVCToolChain.cpp2
2 files changed, 6 insertions, 2 deletions
diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt
index fa0430e211b..5b8422ed550 100644
--- a/clang/lib/Driver/CMakeLists.txt
+++ b/clang/lib/Driver/CMakeLists.txt
@@ -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}
)
diff --git a/clang/lib/Driver/MSVCToolChain.cpp b/clang/lib/Driver/MSVCToolChain.cpp
index 3d822d1efd7..a80ad60cc18 100644
--- a/clang/lib/Driver/MSVCToolChain.cpp
+++ b/clang/lib/Driver/MSVCToolChain.cpp
@@ -38,8 +38,6 @@
#define NOMINMAX
#endif
#include <windows.h>
-
- #pragma comment(lib, "version.lib")
#endif
using namespace clang::driver;
OpenPOWER on IntegriCloud