From 1bc5bd0a2f9a844544d24f2565943c9966d95f76 Mon Sep 17 00:00:00 2001
From: Franziskus Kiefer <franziskuskiefer@gmail.com>
Date: Tue, 13 Jun 2017 14:15:52 +0200
Subject: Bug 868948 - let firefox know about cflags, r=ttaubert

Differential Revision: https://nss-review.dev.mozaws.net/D353
---
 lib/freebl/freebl.gyp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'lib/freebl/freebl.gyp')

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': [
-- 
cgit v1.2.1