From 8894cfab5023872a5f79f08fdea7de31eda5be8c Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 10 Apr 2015 13:24:58 +0800 Subject: [PATCH] mac: Fix libicu symbols not included --- common.gypi | 7 ++++++- script/create-dist.py | 2 +- vendor/node | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/common.gypi b/common.gypi index e33555b2140a..8dc91f692f68 100644 --- a/common.gypi +++ b/common.gypi @@ -101,8 +101,13 @@ ['_target_name=="node"', { 'include_dirs': [ '<(libchromiumcontent_src_dir)/v8/include' ], 'conditions': [ + ['OS=="mac" and libchromiumcontent_component==0', { + 'xcode_settings': { + 'OTHER_LDFLAGS': [ '-Wl,-all_load' ], + }, + }], ['OS=="linux" and libchromiumcontent_component==0', { - # Prevent the linker to strip symbols. + # Prevent the linker from stripping symbols. 'ldflags': [ '-Wl,--whole-archive', '<@(libchromiumcontent_v8_libraries)', diff --git a/script/create-dist.py b/script/create-dist.py index e345ed06ca56..e957725d817d 100755 --- a/script/create-dist.py +++ b/script/create-dist.py @@ -46,8 +46,8 @@ TARGET_BINARIES = { 'icudtl.dat', 'libboringssl.so', 'libffmpegsumo.so', - 'natives_blob.bin', 'libnode.so', + 'natives_blob.bin', 'snapshot_blob.bin', ], } diff --git a/vendor/node b/vendor/node index 561969a65ff3..df87e874a7b9 160000 --- a/vendor/node +++ b/vendor/node @@ -1 +1 @@ -Subproject commit 561969a65ff36c2df94326664813f46b7c5803b1 +Subproject commit df87e874a7b9a72628b442a306028dcffc107fec