Index: third_party/mesa/mesa.gyp |
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp |
index f2e191e6d303e2db99ccbbd82c2a512123b3981b..bcf44be24fe1ec48b3c6ebca3e3f4daa22c56a42 100644 |
--- a/third_party/mesa/mesa.gyp |
+++ b/third_party/mesa/mesa.gyp |
@@ -74,6 +74,14 @@ |
'-fPIC', |
], |
}], |
+ ['ubsan_vptr == 1', { |
+ 'cflags!': [ |
+ # UBsan's vptr is not compatible with -fno-rtti, |
+ # which is used by gallium/auxiliary/Makefile. |
+ '-fsanitize=null', |
+ '-fsanitize=vptr', |
+ ], |
+ }], |
], |
}, |
'targets': [ |