| 1 | diff -u -r ../node-v6.5.0/common.gypi ./common.gypi |
| 2 | --- ../node-v6.5.0/common.gypi 2016-08-26 11:27:16.000000000 -0400 |
| 3 | +++ ./common.gypi 2016-09-14 18:33:18.677745057 -0400 |
| 4 | @@ -78,7 +78,10 @@ |
| 5 | }], |
| 6 | ['OS == "android"', { |
| 7 | 'cflags': [ '-fPIE' ], |
| 8 | - 'ldflags': [ '-fPIE', '-pie' ] |
| 9 | + 'ldflags': [ '-fPIE' ], |
| 10 | + 'target_conditions': [ |
| 11 | + ['_type == "executable"', {'ldflags': [ '-pie' ]}] |
| 12 | + ] |
| 13 | }], |
| 14 | ['node_shared=="true"', { |
| 15 | 'msvs_settings': { |
| 16 | @@ -128,7 +131,10 @@ |
| 17 | }], |
| 18 | ['OS == "android"', { |
| 19 | 'cflags': [ '-fPIE' ], |
| 20 | - 'ldflags': [ '-fPIE', '-pie' ] |
| 21 | + 'ldflags': [ '-fPIE' ], |
| 22 | + 'target_conditions': [ |
| 23 | + ['_type == "executable"', {'ldflags': [ '-pie' ]}] |
| 24 | + ] |
| 25 | }], |
| 26 | ['node_shared=="true"', { |
| 27 | 'msvs_settings': { |