Unified Diff: make_gyp_wrapper.py
Issue 29660563:
Issue 6236 - fix libraries order issue when linking of V8 mksnapshot for linux host (Closed)
Base URL: https://github.com/adblockplus/libadblockplus.git
Patch Set:
Created Jan. 9, 2018, 7:29 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
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 d398feb41c0c4aedd1fe347cdc1ae40d1c35967a..137e4a2449ecf8d65e099d2733234caa5f8d4df7 100644 |
| --- a/make_gyp_wrapper.py |
| +++ b/make_gyp_wrapper.py |
| @@ -119,5 +119,14 @@ def overridden_WriteAndroidNdkModuleRule(self, module_name, all_sources, link_de |
| MakefileWriter.Write = overridden_Write |
| MakefileWriter.WriteAndroidNdkModuleRule = overridden_WriteAndroidNdkModuleRule |
| +# Issue 5393,6236 |
|
sergei
2018/01/09 07:36:10
Added 6236
|
| +# replace $(LD_INPUTS) by "-Wl,--start-group $(LD_INPUTS) -Wl,--end-group" but |
| +# only for cmd_link_host and only on linux. |
| +if platform.system() == "Linux": |
|
sergei
2018/01/09 07:36:10
removed overlooked debug print
|
| + 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:]) |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
