commit 7e6695416e20a741dae6db5940aa44a3e099a62d
author halcanary <halcanary@google.com> Tue Apr 19 08:46:50 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Apr 19 08:46:50 2016 -0700
tree fa95b98d300fcad713606464b48d31f06880a2a8
parent df082c54257256ca7570fb3a75852d2af4e6a80c

fiddle_build_test/gyp: fix mac mesa build (2)

TBR=
NOTRY=true

Review URL: https://codereview.chromium.org/1900173002

gyp/tools.gyp

diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 6c96ca5..190e1fe 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -591,7 +591,7 @@
         ],
       },
     ],
-    ['skia_os in ["linux", "mac"]',
+    ['skia_mesa and skia_os in ["linux", "mac"]',
       {
         'targets': [
           {
@@ -607,7 +607,16 @@
               'pdf.gyp:pdf',
             ],
             'defines': [ 'FIDDLE_BUILD_TEST' ],
-            'link_settings': { 'libraries': [ '-lOSMesa' ], },
+            'conditions': [
+              [ 'skia_os == "mac"',
+                {
+                  'link_settings': { 'libraries': [ '/opt/X11/lib/libOSMesa.dylib', ], },
+                  'include_dirs': [ '/opt/X11/include/', ],
+                }, {
+                  'link_settings': { 'libraries': [ '-lOSMesa' ], },
+                }
+              ],
+            ],
           },
         ],
       },