Unified Diff: make_gyp_wrapper.py
Issue 29510583:
Issue 5393 - fix libraries order issue when linking of V8 mksnapshot for linux host (Closed)
Base URL: https://github.com/adblockplus/libadblockplus.git
Patch Set: fix osx by limiting only for linux
Created Aug. 10, 2017, 1:28 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« Makefile ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: make_gyp_wrapper.py |
| diff --git a/make_gyp_wrapper.py b/make_gyp_wrapper.py |
| index 1bf2761bfdc18be29950f44f26e971fe359df9b5..641e64c626f8696fd1e23f3fa9c539d278f32456 100644 |
| --- a/make_gyp_wrapper.py |
| +++ b/make_gyp_wrapper.py |
| @@ -73,6 +73,7 @@ _abp_configs attribute of instance of MakefileWriter. |
| """ |
| import os |
| +import platform |
| import sys |
| import types |
| @@ -118,5 +119,15 @@ def overridden_WriteAndroidNdkModuleRule(self, module_name, all_sources, link_de |
| MakefileWriter.Write = overridden_Write |
| MakefileWriter.WriteAndroidNdkModuleRule = overridden_WriteAndroidNdkModuleRule |
| +# Issue 5393 |
| +# replace $(LD_INPUTS) by "-Wl,--start-group $(LD_INPUTS) -Wl,--end-group" but |
| +# only for cmd_link_host and only on linux. |
| +print platform.system() |
| +if platform.system() == "Linux": |
| + gyp.generator.make.LINK_COMMANDS_ANDROID = \ |
| + gyp.generator.make.LINK_COMMANDS_ANDROID[:663] + \ |
| + "-Wl,--start-group $(LD_INPUTS) -Wl,--end-group" + \ |
| + gyp.generator.make.LINK_COMMANDS_ANDROID[675:] |
| + |
| if __name__ == '__main__': |
| gyp.main(sys.argv[1:]) |
