diff options
| author | Kevin Jacobs <kjacobs@mozilla.com> | 2019-05-03 20:44:52 +0000 |
|---|---|---|
| committer | Kevin Jacobs <kjacobs@mozilla.com> | 2019-05-03 20:44:52 +0000 |
| commit | 80740228fe8a38ce51335520d2edd2ead179e0a7 (patch) | |
| tree | 433eacdfa6602111cf129db252f51e0814313070 /coreconf/config.gypi | |
| parent | 3ed4ae2e3583bca6e7aa163f380d754f8b853d99 (diff) | |
| download | nss-hg-80740228fe8a38ce51335520d2edd2ead179e0a7.tar.gz | |
Bug 1548398 - Add freebl_gtest to nss.gyp, fix freebl_gtest cross-compilation and gcc-4.8 support. r=jcjNSS_3_44_BETA1
Updated gyp files to add -msse2 GCC option, iff the compiler is gcc and target is x64 or ia32.
Root cause for the 4.8 failure is a gcc bug where the "#pragma GCC target("sse2")" option used in gcm.h doesn't work when compiling C++ code, as the gtests do.
Differential Revision: https://phabricator.services.mozilla.com/D29886
Diffstat (limited to 'coreconf/config.gypi')
| -rw-r--r-- | coreconf/config.gypi | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/coreconf/config.gypi b/coreconf/config.gypi index 1dde15fe3..a0d381f0c 100644 --- a/coreconf/config.gypi +++ b/coreconf/config.gypi @@ -64,10 +64,15 @@ ], }], ['"<(GENERATOR)"=="ninja"', { - 'cc_is_clang%': '<!(<(python) <(DEPTH)/coreconf/check_cc_clang.py)', + 'cc_is_clang%': '<!(<(python) <(DEPTH)/coreconf/check_cc.py clang)', }, { 'cc_is_clang%': '0', }], + ['"<(GENERATOR)"=="ninja"', { + 'cc_is_gcc%': '<!(<(python) <(DEPTH)/coreconf/check_cc.py gcc)', + }, { + 'cc_is_gcc%': '0', + }], ], }, # Copy conditionally-set variables out one scope. @@ -86,6 +91,7 @@ 'dll_suffix': '<(dll_suffix)', 'freebl_name': '<(freebl_name)', 'cc_is_clang%': '<(cc_is_clang)', + 'cc_is_gcc%': '<(cc_is_gcc)', 'cc_use_gnu_ld%': '<(cc_use_gnu_ld)', # Some defaults 'disable_tests%': 0, |