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