summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INSTALL4
-rw-r--r--coin/instructions/common_environment.yaml12
-rw-r--r--doc/installerfw-getting-started.qdoc4
3 files changed, 6 insertions, 14 deletions
diff --git a/INSTALL b/INSTALL
index 537609844..8d1b934c6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -95,11 +95,11 @@ $ sudo apt install zlib1g-dev liblzma-dev libbz2-dev
The easiest way to install the missing libraries is with a third party
package manager solution, like Homebrew or MacPorts. On macOS 10.15 you
-should only need to install the libiconv and liblzma libraries.
+should only need to additionally install the liblzma library.
On Homebrew this would be:
-$ brew install libiconv xz
+$ brew install xz
### Troubleshooting
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml
index cdbc1ea3f..989351a82 100644
--- a/coin/instructions/common_environment.yaml
+++ b/coin/instructions/common_environment.yaml
@@ -58,17 +58,9 @@ instructions:
property: host.os
equals_value: MacOS
- - type: EnvironmentVariable
- variableName: IFW_ICONV_LIBRARY
- variableValue: "/usr/local/opt/libiconv/lib/libiconv.a"
- enable_if:
- condition: property
- property: host.os
- equals_value: MacOS
-
- type: PrependToEnvironmentVariable
variableName: C_INCLUDE_PATH
- variableValue: "/usr/local/opt/xz/include:/usr/local/opt/libiconv/include:"
+ variableValue: "/usr/local/opt/xz/include:"
enable_if:
condition: property
property: host.os
@@ -76,7 +68,7 @@ instructions:
- type: PrependToEnvironmentVariable
variableName: CPLUS_INCLUDE_PATH
- variableValue: "/usr/local/opt/xz/include:/usr/local/opt/libiconv/include:"
+ variableValue: "/usr/local/opt/xz/include:"
enable_if:
condition: property
property: host.os
diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc
index e49de89af..cfb302544 100644
--- a/doc/installerfw-getting-started.qdoc
+++ b/doc/installerfw-getting-started.qdoc
@@ -164,12 +164,12 @@
The easiest way to install the missing libraries is with a third party
package manager solution, like Homebrew or MacPorts. On macOS 10.15 you
- should only need to additionally install the libiconv and liblzma libraries.
+ should only need to additionally install the liblzma library.
On Homebrew this would be:
\code
- brew install libiconv xz
+ brew install xz
\endcode
\section3 Troubleshooting