# HG changeset patch
# User Mike Hommey <mh+mozilla@glandium.org>
# Date 1350466554 -7200
# Node ID ba711b0fef346245ae2fb5e8c020f27d46b40870
# Parent  5dc6962cfcd2a1cb2323f127a697f0cd08012767
Bug 799975 - Fix webrtc when building with system nspr/nss

diff --git a/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py b/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
--- a/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
+++ b/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
@@ -45,16 +45,19 @@ NO_SUBMAKEFILES_RULE = 1
 include $(topsrcdir)/config/rules.mk
 include $(DEPTH)/%(relative_path)s/common.mk
 """
 
 COMMON_MK = """# This file was generated by mozmake.py. Do not edit it directly.
 ifndef COMMON_MK_INCLUDED
 COMMON_MK_INCLUDED := 1
 
+CFLAGS += $(NSPR_CFLAGS) $(NSS_CFLAGS)
+CXXFLAGS += $(NSPR_CFLAGS) $(NSS_CFLAGS)
+
 ifdef MOZ_DEBUG
 CFLAGS += $(CPPFLAGS_Debug) $(CFLAGS_Debug)
 CXXFLAGS += $(CPPFLAGS_Debug) $(CXXFLAGS_Debug)
 DEFINES += $(DEFINES_Debug)
 LOCAL_INCLUDES += $(INCLUDES_Debug)
 else # non-MOZ_DEBUG
 CFLAGS += $(CPPFLAGS_Release) $(CFLAGS_Release)
 CXXFLAGS += $(CPPFLAGS_Release) $(CXXFLAGS_Release)