From 7fd7699adad0c64070bce96d9e9741d9cd72b6d1 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 23 Jun 2016 11:15:56 +0900 Subject: [PATCH] Revert "Replace --whole-archive with --start-group" --- brightray/brightray.gyp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index 156f95de36..b5fcbbd05c 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -36,13 +36,14 @@ 'conditions': [ # Link with libraries of libchromiumcontent. ['OS=="linux" and libchromiumcontent_component==0', { - # On Linux we have to use "--start-group" or we will have plenty of + # On Linux we have to use "--whole-archive" to force executable + # to include all symbols, otherwise we will have plenty of # unresolved symbols errors. - 'link_settings': { - 'libraries': [ - '-Wl,--start-group', + 'direct_dependent_settings': { + 'ldflags': [ + '-Wl,--whole-archive', '<@(libchromiumcontent_libraries)', - '-Wl,--end-group' + '-Wl,--no-whole-archive', ], } }, { # (Release build on Linux)