From 4ddcc40d326b82d8e3b7c88cdba6eeb03fb0006b Mon Sep 17 00:00:00 2001
From: "henrike@webrtc.org"
 <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Wed, 25 Jun 2014 20:14:13 +0000
Subject: [PATCH] pkg-config-wrapper should not be run when build_nss is
 disabled (=0).

BUG=b/15411893
R=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/12839004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6538 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 webrtc/base/base.gyp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index 330ea82a20..f05c3251d8 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -577,14 +577,22 @@
               '-lX11',
               '-lXcomposite',
               '-lXrender',
-              '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
             ],
           },
-          'cflags': [
-            '<!@(<(pkg-config) --cflags nss)',
-          ],
-          'ldflags': [
-            '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
+          'conditions': [
+            ['build_ssl==1', {
+              'link_settings': {
+                'libraries': [
+                  '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
+                ],
+              },
+              'cflags': [
+                '<!@(<(pkg-config) --cflags nss)',
+              ],
+              'ldflags': [
+                '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
+              ],
+            }],
           ],
         }, {
           'sources!': [