commit 423e58a503646183e61cab4f45cf41479d25d8f1
author Davide Pesavento <davidepesa@gmail.com> Fri Aug 12 15:51:42 2022 -0400
committer Davide Pesavento <davidepesa@gmail.com> Fri Aug 12 15:51:42 2022 -0400
tree 51310d83eaaee84d24c4ed21831f467397a14ec4
parent f597d07ec9e6c97e4db60df9b99ec793c3407777

build+ci: support macOS on arm64

Refs: #5135
Change-Id: I25a6a77eb6c60e00548704eaea88eb1ca2afc200

.waf-tools/default-compiler-flags.py

diff --git a/.waf-tools/default-compiler-flags.py b/.waf-tools/default-compiler-flags.py
index 7c6d282..3ba2dc3 100644
--- a/.waf-tools/default-compiler-flags.py
+++ b/.waf-tools/default-compiler-flags.py
@@ -33,7 +33,7 @@
                       'The minimum supported clang version is 6.0.')
         conf.flags = ClangFlags()
     else:
-        warnmsg = '%s compiler is unsupported' % cxx
+        warnmsg = f'{cxx} compiler is unsupported'
         conf.flags = CompilerFlags()
 
     if errmsg:
@@ -200,7 +200,8 @@
         flags = super(ClangFlags, self).getGeneralFlags(conf)
         if Utils.unversioned_sys_platform() == 'darwin':
             # Bug #4296
-            flags['CXXFLAGS'] += [['-isystem', '/usr/local/include'], # for Homebrew
+            brewdir = '/opt/homebrew' if platform.machine() == 'arm64' else '/usr/local'
+            flags['CXXFLAGS'] += [['-isystem', f'{brewdir}/include'], # for Homebrew
                                   ['-isystem', '/opt/local/include']] # for MacPorts
         elif Utils.unversioned_sys_platform() == 'freebsd':
             # Bug #4790