mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

win: Ignore duplicate symbols between BoringSSL and OpenSSL

Browse source
This commit is contained in:
Cheng Zhao 2015-04-07 22:56:21 +08:00
parent 9a458785b6
commit 0cc36377a5
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
common.gypi
View file

@ -191,6 +191,9 @@
}, },
'VCLinkerTool': { 'VCLinkerTool': {
'AdditionalOptions': [ '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 # ATL 8.0 included in WDK 7.1 makes the linker to generate following
# warnings: # warnings:
# - warning LNK4254: section 'ATL' (50000040) merged into # - warning LNK4254: section 'ATL' (50000040) merged into

2
vendor/brightray vendored

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