summaryrefslogtreecommitdiffstats
path: root/content/content.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'content/content.gyp')
-rw-r--r--content/content.gyp7
1 files changed, 5 insertions, 2 deletions
diff --git a/content/content.gyp b/content/content.gyp
index be3f85c..0e8fa51 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -22,8 +22,11 @@
# upstream unnecessarily (e.g., content_renderer depends on allocator
# and chrome_exe depends on content_common but we don't want
# chrome_exe to have to depend on allocator).
- # TODO(dpranke): Uncomment: ['component == "static_library"', {
- ['1 == 1', {
+ #
+ # TODO(dpranke): Remove the mac conditional once the circular
+ # dependencies in WebKit.gyp are fixed.
+ # See https://bugs.webkit.org/show_bug.cgi?id=68463
+ ['OS == "mac" or component == "static_library"', {
'targets': [
{'target_name': 'content',
'type': 'none',