Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1460)

Unified Diff: runtime/bin/net/ssl.gyp

Issue 14499010: Make ninja build on mac work (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/net/ssl.gyp
diff --git a/runtime/bin/net/ssl.gyp b/runtime/bin/net/ssl.gyp
index 3798baa801cd5eaac0cde2a1793935b31a43ccf5..a86594a872fd233a9aea289feae28dff3d73e1da 100644
--- a/runtime/bin/net/ssl.gyp
+++ b/runtime/bin/net/ssl.gyp
@@ -8,6 +8,18 @@
# This file is a modified copy of Chromium's src/net/third_party/nss/ssl.gyp.
# Revision 169195 (this should agree with "nss_rev" in DEPS).
+
+# The following modification was made to make sure we have the same
+# xcode_settings on all configurations (otherwise we can't build with ninja):
+# 'configurations': {
+# 'Debug_Base': {
+# + 'inherit_from': ['Dart_Base'],
+# 'defines': [
+# 'DEBUG',
+# ],
+# },
+# },
+
{
# Conditions section for ssl-bodge (Compiling SSL on linux using system
# NSS and NSPR libraries) removed:
@@ -159,6 +171,7 @@
],
'configurations': {
'Debug_Base': {
+ 'inherit_from': ['Dart_Base'],
'defines': [
'DEBUG',
],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698