Refine Inline.cc carveout for arm64 darwin builds (#7662)

randall · zwoop · commit 43f08cb343b0 · 2021-05-26T09:54:30.000-06:00
This allows the macOS release build to complete successfully (cherry picked from commit 43452ca)
diff --git a/iocore/aio/Inline.cc b/iocore/aio/Inline.cc
@@ -26,7 +26,7 @@
  *
  */
 
-#if !defined(darwin)
+#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_AIO.h"
 #endif
diff --git a/iocore/cache/Inline.cc b/iocore/cache/Inline.cc
@@ -26,7 +26,7 @@
  *
  */
 
-#if !defined(darwin)
+#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_Cache.h"
 #endif
diff --git a/iocore/dns/Inline.cc b/iocore/dns/Inline.cc
@@ -26,7 +26,7 @@
  *
  */
 
-#if !defined(darwin)
+#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_DNS.h"
 #endif
diff --git a/iocore/eventsystem/Inline.cc b/iocore/eventsystem/Inline.cc
@@ -26,7 +26,7 @@
  *
  */
 
-#if !defined(darwin)
+#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_EventSystem.h"
 #endif
diff --git a/iocore/hostdb/Inline.cc b/iocore/hostdb/Inline.cc
@@ -26,7 +26,7 @@
  *
  */
 
-#if !defined(darwin)
+#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_HostDB.h"
 #endif
diff --git a/iocore/net/Inline.cc b/iocore/net/Inline.cc
@@ -26,7 +26,7 @@
  *
  */
 
-#if !defined(darwin)
+#if !(defined(darwin) && defined(__aarch64__))
 #define TS_INLINE
 #include "P_Net.h"
 #endif

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`*`
`27`	`27`	`*/`
`28`	`28`
`29`		`-#if !defined(darwin)`
	`29`	`+#if !(defined(darwin) && defined(__aarch64__))`
`30`	`30`	`#define TS_INLINE`
`31`	`31`	`#include "P_AIO.h"`
`32`	`32`	`#endif`