From cdd632ed0711cf2750cef922b99176b6f3768ad1 Mon Sep 17 00:00:00 2001
From: Willi Mutschler <willi@mutschler.eu>
Date: Wed, 27 Sep 2023 12:09:30 +0200
Subject: [PATCH] macOS installer doc: fix capitalization of GCC and path to
Clang
---
doc/manual/source/installation-and-configuration.rst | 8 ++++----
macOS/conclusion_template.html | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/manual/source/installation-and-configuration.rst b/doc/manual/source/installation-and-configuration.rst
index acbec1b529..c8befab7e2 100644
--- a/doc/manual/source/installation-and-configuration.rst
+++ b/doc/manual/source/installation-and-configuration.rst
@@ -105,7 +105,7 @@ Note that several versions of Dynare can coexist (by default in
settings (see :ref:`words-warning`).
It is recommended to install the Xcode Command Line Tools (this is an Apple product)
-and gcc via Homebrew_ (see :ref:`prerequisites-macos`).
+and GCC via Homebrew_ (see :ref:`prerequisites-macos`).
With Octave
^^^^^^^^^^^
@@ -190,11 +190,11 @@ Additionally, to make MATLAB aware that you agree to the terms of Xcode, run the
Otherwise you will see a warning that Xcode is installed, but its license has not been accepted.
-We recommend making use of optimized compilation flags when using :opt:`use_dll` and for this you need to install gcc via Homebrew_::
+We recommend making use of optimized compilation flags when using :opt:`use_dll` and for this you need to install GCC via Homebrew_::
brew install gcc
-If you already have installed gcc, Dynare will automatically prefer it for :opt:`use_dll` if the binaries are in /usr/local/bin.
-Otherwise, it will fall back to Clang in /usr/bin/gcc.
+If you already have installed GCC, Dynare will automatically prefer it for :opt:`use_dll` if the binaries are in /usr/local/bin.
+Otherwise, it will fall back to Clang in /usr/bin/clang.
With Octave
^^^^^^^^^^^
diff --git a/macOS/conclusion_template.html b/macOS/conclusion_template.html
index ab0bd77dad..5f88c45bef 100644
--- a/macOS/conclusion_template.html
+++ b/macOS/conclusion_template.html
@@ -35,11 +35,11 @@
<p class="bold-text">Compilation Environment for use_dll option</p>
<p>Dynare ships a compilation environment that can be used with the use_dll option. To install this environment correctly, the Xcode Command Line Tools are sufficient.</p>
- <p>However, we recommend making use of optimized compilation flags and for this you need to install gcc-GCC_VERSION via Homebrew.
+ <p>However, we recommend making use of optimized compilation flags and for this you need to install GCC via Homebrew.
For this, follow <a href="https://brew.sh" target="_blank" rel="noopener noreferrer">https://brew.sh</a> to install Homebrew and then type the following into Terminal.app:</p>
<code>brew install gcc@GCC_VERSION</code>
- <p>If you already have installed gcc-GCC_VERSION, Dynare will automatically prefer it for use_dll if the binaries are either in /opt/homebrew/bin/gcc-GCC_VERSION (arm64) or in /usr/local/bin/gcc-GCC_VERSION (x86_64). Otherwise, it will fall back to Clang in /usr/bin/gcc (for both arm64 and x86_64).</p>
+ <p>If you already have installed GCC, Dynare will automatically prefer it for use_dll if the binaries are either in /opt/homebrew/bin/gcc-GCC_VERSION (arm64) or in /usr/local/bin/gcc-GCC_VERSION (x86_64). Otherwise, it will fall back to Clang in /usr/bin/clang (for both arm64 and x86_64).</p>
</main>
</body>
</html>
\ No newline at end of file
--
GitLab