diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2017-06-13 14:15:52 +0200 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2017-06-13 14:15:52 +0200 |
| commit | 1bc5bd0a2f9a844544d24f2565943c9966d95f76 (patch) | |
| tree | 4ee5d6fdb447c98c8595561d42606ae23761a796 /lib/freebl/freebl.gyp | |
| parent | 19adc7041d8910d42c5a05193977961491955f2a (diff) | |
| download | nss-hg-1bc5bd0a2f9a844544d24f2565943c9966d95f76.tar.gz | |
Bug 868948 - let firefox know about cflags, r=ttaubert
Differential Revision: https://nss-review.dev.mozaws.net/D353
Diffstat (limited to 'lib/freebl/freebl.gyp')
| -rw-r--r-- | lib/freebl/freebl.gyp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/lib/freebl/freebl.gyp b/lib/freebl/freebl.gyp index 670ccf13e..8c0d0dcd5 100644 --- a/lib/freebl/freebl.gyp +++ b/lib/freebl/freebl.gyp @@ -153,6 +153,12 @@ 'MP_API_COMPATIBLE' ], 'conditions': [ + [ 'target_arch=="ia32" or target_arch=="x64"', { + 'cflags_mozilla': [ + '-mpclmul', + '-maes', + ], + }], [ 'OS=="mac"', { 'xcode_settings': { # I'm not sure since when this is supported. @@ -164,10 +170,6 @@ }, }], [ 'OS=="win" and target_arch=="ia32"', { - 'cflags_mozilla': [ - '-mpclmul', - '-maes', - ], 'msvs_settings': { 'VCCLCompilerTool': { #TODO: -Ox optimize flags @@ -201,10 +203,6 @@ }, }], [ 'cc_use_gnu_ld==1 and OS=="win" and target_arch=="x64"', { - 'cflags_mozilla': [ - '-mpclmul', - '-maes', - ], 'defines': [ 'MP_IS_LITTLE_ENDIAN', 'NSS_BEVAND_ARCFOUR', @@ -268,10 +266,6 @@ '-mpclmul', '-maes', ], - 'cflags_mozilla': [ - '-mpclmul', - '-maes', - ], }], [ 'target_arch=="arm"', { 'defines': [ |