From e84ab66d65df2e7fea9426e579d6816f8a4cca2b Mon Sep 17 00:00:00 2001
From: Willi Mutschler <willi@mutschler.eu>
Date: Mon, 30 May 2022 15:20:39 +0200
Subject: [PATCH] Add apple silicon info to templates
(cherry picked from commit 7d483da86adac79fdec8ba1533924df982da9f86)
---
.gitignore | 1 +
macOS/distribution_template.xml | 2 +-
macOS/welcome_template.html | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index f3cdbd5e4f..82e8a64446 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,6 +80,7 @@ doc/internals/ltxpng
*.mexa64
*.mexw32
*.mexw64
+*.mexmaca64
*.mexmaci
*.mexmaci64
/mex/matlab/
diff --git a/macOS/distribution_template.xml b/macOS/distribution_template.xml
index fa213eb3a1..cc80c9f6ca 100644
--- a/macOS/distribution_template.xml
+++ b/macOS/distribution_template.xml
@@ -6,7 +6,7 @@
<welcome file="welcome.html" mime-type="text/html" />
<license file="gpl-3.0-standalone.html" mime-type="text/html" />
<pkg-ref id="org.dynare" />
- <options customize="allow" require-scripts="false" hostArchitectures="x86_64" />
+ <options customize="allow" require-scripts="false" hostArchitectures="x86_64,arm64" />
<choices-outline>
<line choice="org.dynare" />
<line choice="org.dynare.gcc" />
diff --git a/macOS/welcome_template.html b/macOS/welcome_template.html
index 43b5295d77..900811f688 100644
--- a/macOS/welcome_template.html
+++ b/macOS/welcome_template.html
@@ -10,6 +10,6 @@
<p>Installing GCC will require an active internet connection with the ability to connect to the Apple servers and GitHub. The installation will take anywhere from a few minutes to a half an hour during the <i>Running package scripts</i> phase of Installation. The time it takes depends on your internet speed, the speed of your computer, and whether or not you already have XCode Command Line Tools installed. The progress bar will not advance during this phase. Please be patient.</p>
- <p> You can choose not to install GCC by choosing <i>Customize</i> from the <i>Installation Type</i> screen and deselecting <i>GCC compiler</i>. If you already have <tt>GCC_BINARY</tt> installed under <tt>/usr/local</tt>, you can forgo the installation of GCC here as Dynare will find your system compiler when you use <tt>use_dll</tt>.</p>
+ <p> You can choose not to install GCC by choosing <i>Customize</i> from the <i>Installation Type</i> screen and deselecting <i>GCC compiler</i>. If you already have <tt>GCC_BINARY</tt> installed under either <tt>/opt/homebrew/bin</tt> for Apple Silicon or <tt>/usr/local/bin</tt> for Intel systems, you can forgo the installation of GCC here as Dynare will find your system compiler when you use <tt>use_dll</tt>.</p>
</body>
</html>
--
GitLab