diff options
| author | Martin Thomson <mt@lowentropy.net> | 2019-05-16 09:43:04 +0000 |
|---|---|---|
| committer | Martin Thomson <mt@lowentropy.net> | 2019-05-16 09:43:04 +0000 |
| commit | 390d9cfd74daaa3542ba11456ec36f0db74fd4df (patch) | |
| tree | 57d10eb971eca40a015aacb06b8fafdf6cf2c6a7 /coreconf/config.gypi | |
| parent | 32e4cba5ef62427b02a21d9a1225c9405c922f9b (diff) | |
| download | nss-hg-390d9cfd74daaa3542ba11456ec36f0db74fd4df.tar.gz | |
Bug 1551129 - Enable --static build on windows, r=kevinjacobs
Summary:
Refinements for static building and linking.
Reviewers: KevinJacobs
Reviewed By: KevinJacobs
Bug #: 1551129
Differential Revision: https://phabricator.services.mozilla.com/D30853
Diffstat (limited to 'coreconf/config.gypi')
| -rw-r--r-- | coreconf/config.gypi | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/coreconf/config.gypi b/coreconf/config.gypi index e33cdfaa3..2f17c822d 100644 --- a/coreconf/config.gypi +++ b/coreconf/config.gypi @@ -150,11 +150,6 @@ 'NSS_NO_INIT_SUPPORT', ], }], - [ 'static_libs==1', { - 'variables': { - 'standalone_static_library': '1', - }, - }], [ 'OS!="android" and OS!="mac" and OS!="ios" and OS!="win"', { 'libraries': [ '-lpthread', @@ -231,7 +226,7 @@ 'product_dir': '<(nss_dist_obj_dir)/lib' }, '_type=="executable"', { 'product_dir': '<(nss_dist_obj_dir)/bin' - }, '_standalone_static_library==1', { + }, 'static_libs==1 or _standalone_static_library==1', { 'product_dir': '<(nss_dist_obj_dir)/lib' }], # mapfile handling @@ -322,6 +317,9 @@ }, }, }], + [ '_type=="static_library" and static_libs==1', { + 'standalone_static_library': 1, + }], ], 'default_configuration': 'Debug', 'configurations': { |