diff options
| author | Giovanni Campagna <gcampagn@cs.stanford.edu> | 2017-09-24 16:11:48 -0700 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2019-12-12 09:10:09 -0500 |
| commit | 99fe9dd11225daf238c72978198237dcdc0b22bc (patch) | |
| tree | 3588ddb56369e181c7ed38193546e34456576aec /common.gypi | |
| parent | d8fc0ae50fd0c7fe403cbbd27819eb5b00acb7da (diff) | |
| download | node-new-99fe9dd11225daf238c72978198237dcdc0b22bc.tar.gz | |
build: fix library version and compile flags on Android
Compiling a library with -fPIE won't do, and on Android libraries
are not versioned.
PR-URL: https://github.com/nodejs/node/pull/29388
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to 'common.gypi')
| -rw-r--r-- | common.gypi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common.gypi b/common.gypi index c51912ddba..210e86eeb2 100644 --- a/common.gypi +++ b/common.gypi @@ -127,8 +127,8 @@ 'ldflags': [ '-Wl,-bbigtoc' ], }], ['OS == "android"', { - 'cflags': [ '-fPIE' ], - 'ldflags': [ '-fPIE', '-pie' ] + 'cflags': [ '-fPIC' ], + 'ldflags': [ '-fPIC' ] }], ], 'msvs_settings': { @@ -187,8 +187,8 @@ ], },], ['OS == "android"', { - 'cflags': [ '-fPIE' ], - 'ldflags': [ '-fPIE', '-pie' ] + 'cflags': [ '-fPIC' ], + 'ldflags': [ '-fPIC' ] }], ], 'msvs_settings': { |