summaryrefslogtreecommitdiff
path: root/security/nss/coreconf/config.gypi
diff options
context:
space:
mode:
Diffstat (limited to 'security/nss/coreconf/config.gypi')
-rw-r--r--security/nss/coreconf/config.gypi12
1 files changed, 7 insertions, 5 deletions
diff --git a/security/nss/coreconf/config.gypi b/security/nss/coreconf/config.gypi
index 58f46125ef..30d9b254f0 100644
--- a/security/nss/coreconf/config.gypi
+++ b/security/nss/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,
@@ -393,6 +393,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',
@@ -406,9 +411,6 @@
'cflags_cc': [
'-std=c++11',
],
- 'ldflags': [
- '-z', 'noexecstack',
- ],
'conditions': [
[ 'target_arch=="ia32"', {
'cflags': ['-m32'],
@@ -648,7 +650,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)'],
},