Merge pull request #944 from pkgw/harfbuzz-macos-workaround

pkgw · web-flow · commit 34afff0015e1 · 2022-10-03T23:45:17.000-04:00
bridge_harfbuzz: work around build failure with macOS SDK 10.9
diff --git a/crates/bridge_harfbuzz/build.rs b/crates/bridge_harfbuzz/build.rs
@@ -105,6 +105,9 @@ mod inner {
 
         if target.contains("apple") {
             cfg.define("HAVE_CORETEXT", "1");
+
+            // AssertMacros.h defines a verify() that conflicts with hb-shape.cc.
+            cfg.define("__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES", "0");
         }
 
         if target.contains("windows-gnu") {

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,9 @@ mod inner {`
`105`	`105`
`106`	`106`	`if target.contains("apple") {`
`107`	`107`	`cfg.define("HAVE_CORETEXT", "1");`
	`108`	`+`
	`109`	`+ // AssertMacros.h defines a verify() that conflicts with hb-shape.cc.`
	`110`	`+ cfg.define("__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES", "0");`
`108`	`111`	`}`
`109`	`112`
`110`	`113`	`if target.contains("windows-gnu") {`