diff options
| author | Petr Sumbera <petr.sumbera@oracle.com> | 2020-10-23 20:34:27 +0000 |
|---|---|---|
| committer | Petr Sumbera <petr.sumbera@oracle.com> | 2020-10-23 20:34:27 +0000 |
| commit | 1e26e71f47e3f74d8b928641c0f8827c6548e72f (patch) | |
| tree | 0b347a22aae7ef5dc133b461bf67f997b1ce2786 /coreconf | |
| parent | 634e1eeb85976e0fb3ac4c1efc8d5b2694e806ea (diff) | |
| download | nss-hg-1e26e71f47e3f74d8b928641c0f8827c6548e72f.tar.gz | |
Bug 1667989 - coreconf/config.gypi should allow correct linking on Solaris r=kjacobs,bbeurdouche
Differential Revision: https://phabricator.services.mozilla.com/D26278
Diffstat (limited to 'coreconf')
| -rw-r--r-- | coreconf/config.gypi | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/coreconf/config.gypi b/coreconf/config.gypi index 760b51a26..cbcdf4c13 100644 --- a/coreconf/config.gypi +++ b/coreconf/config.gypi @@ -37,7 +37,7 @@ },{ 'use_system_sqlite%': 0, }], - ['OS=="mac" or OS=="ios" or OS=="win"', { + ['OS=="mac" or OS=="ios" or OS=="solaris" or OS=="win"', { 'cc_use_gnu_ld%': 0, }, { 'cc_use_gnu_ld%': 1, @@ -397,6 +397,11 @@ '_REENTRANT', ], }], + [ 'OS!="mac" and OS!="ios" and OS!="solaris" and OS!="win"', { + 'ldflags': [ + '-z', 'noexecstack', + ], + }], [ 'OS!="mac" and OS!="ios" and OS!="win"', { 'cflags': [ '-fPIC', @@ -410,9 +415,6 @@ 'cflags_cc': [ '-std=c++11', ], - 'ldflags': [ - '-z', 'noexecstack', - ], 'conditions': [ [ 'target_arch=="ia32"', { 'cflags': ['-m32'], @@ -662,7 +664,7 @@ }, }, 'conditions': [ - [ 'cc_use_gnu_ld==1', { + [ 'cc_use_gnu_ld==1 or OS=="solaris"', { 'variables': { 'process_map_file': ['/bin/sh', '-c', '/usr/bin/env grep -v ";-" >(mapfile) | sed -e "s,;+,," -e "s; DATA ;;" -e "s,;;,," -e "s,;.*,;," > >@(_outputs)'], }, |