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

mac: Fix libicu symbols not included

Browse source
This commit is contained in:
Cheng Zhao 2015-04-10 13:24:58 +08:00
parent 8500a53c23
commit 8894cfab50
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common.gypi
View file

@ -101,8 +101,13 @@
['_target_name=="node"', { ['_target_name=="node"', {
'include_dirs': [ '<(libchromiumcontent_src_dir)/v8/include' ], 'include_dirs': [ '<(libchromiumcontent_src_dir)/v8/include' ],
'conditions': [ 'conditions': [
['OS=="mac" and libchromiumcontent_component==0', {
'xcode_settings': {
'OTHER_LDFLAGS': [ '-Wl,-all_load' ],
},
}],
['OS=="linux" and libchromiumcontent_component==0', { ['OS=="linux" and libchromiumcontent_component==0', {
# Prevent the linker to strip symbols. # Prevent the linker from stripping symbols.
'ldflags': [ 'ldflags': [
'-Wl,--whole-archive', '-Wl,--whole-archive',
'<@(libchromiumcontent_v8_libraries)', '<@(libchromiumcontent_v8_libraries)',

2
script/create-dist.py
View file

@ -46,8 +46,8 @@ TARGET_BINARIES = {
'icudtl.dat', 'icudtl.dat',
'libboringssl.so', 'libboringssl.so',
'libffmpegsumo.so', 'libffmpegsumo.so',
'natives_blob.bin',
'libnode.so', 'libnode.so',
'natives_blob.bin',
'snapshot_blob.bin', 'snapshot_blob.bin',
], ],
} }

2
vendor/node vendored

@ -1 +1 @@
Subproject commit 561969a65ff36c2df94326664813f46b7c5803b1 Subproject commit df87e874a7b9a72628b442a306028dcffc107fec