Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

win: Ignore duplicate symbols between BoringSSL and OpenSSL

Cheng Zhao 10 years ago
parent
9a458785b6
commit
0cc36377a5
2 changed files with 4 additions and 1 deletions
Split View Show Diff Stats
  1. 3 0
      common.gypi
  2. 1 1
      vendor/brightray

+ 3 - 0
common.gypi
View File 

@@ -191,6 +191,9 @@
 
       },
 
       'VCLinkerTool': {
 
         'AdditionalOptions': [
 
+          # Force linking even though we have duplicate symbols between
 
+          # BoringSSL and OpenSSL.
 
+          '/FORCE:MULTIPLE',
 
           # ATL 8.0 included in WDK 7.1 makes the linker to generate following
 
           # warnings:
 
           #   - warning LNK4254: section 'ATL' (50000040) merged into

+ 1 - 1
vendor/brightray
View File 

@@ -1 +1 @@
 
-Subproject commit ae360b94fff5a25222b3a535aad8bb4e7cd3b992
 
+Subproject commit 616ce9051fef9896651686aa9a0b6403caa4e1a8