From 94549c78bdcd9e0a20a7fa23b7fb05f0fcce1232 Mon Sep 17 00:00:00 2001 From: Randall Meyer Date: Tue, 30 Mar 2021 22:15:43 -0700 Subject: [PATCH] Refine Inline.cc carveout for arm64 darwin builds This allows the macOS release build to complete successfully --- iocore/aio/Inline.cc | 2 +- iocore/cache/Inline.cc | 2 +- iocore/dns/Inline.cc | 2 +- iocore/eventsystem/Inline.cc | 2 +- iocore/hostdb/Inline.cc | 2 +- iocore/net/Inline.cc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/iocore/aio/Inline.cc b/iocore/aio/Inline.cc index 03ba7b0549b..7979c47bd63 100644 --- 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 index 80b7af87f15..6b9a4e2a056 100644 --- 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 index c7142c7cad5..0d065156a1c 100644 --- 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 index 98a80a37341..3c55a63096a 100644 --- 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 index 17cb3fe30d8..3be8524fada 100644 --- 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 index fe9fe52040c..f54c7db7390 100644 --- 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