Merge pull request #229 from electron/revert-228-no-whole-archive
Revert "Replace --whole-archive with --start-group"
This commit is contained in:
commit
6140fb2b14
1 changed files with 6 additions and 5 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue