Skip to content
Snippets Groups Projects
Verified Commit 1c3e6f89 authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

macOS: bump to GCC 11 (for compilation and for use_dll)

parent e80215e3
No related branches found
No related tags found
No related merge requests found
Pipeline #5547 passed
...@@ -83,7 +83,7 @@ build_macos_x86_64: ...@@ -83,7 +83,7 @@ build_macos_x86_64:
- macOS - macOS
script: script:
- autoreconf -si - autoreconf -si
- './configure CC=gcc-10 CXX=g++-10 LDFLAGS="-static-libgcc -s" LEX=/usr/local/opt/flex/bin/flex YACC=/usr/local/opt/bison/bin/bison' - './configure CC=gcc-11 CXX=g++-11 LDFLAGS="-static-libgcc -s" LEX=/usr/local/opt/flex/bin/flex YACC=/usr/local/opt/bison/bin/bison'
- make -j$(nproc) - make -j$(nproc)
- mkdir -p $CI_COMMIT_SHA/macos-x86_64 - mkdir -p $CI_COMMIT_SHA/macos-x86_64
- tar -caf $CI_COMMIT_SHA/macos-x86_64/dynare-preprocessor.tar.gz -C src dynare-preprocessor - tar -caf $CI_COMMIT_SHA/macos-x86_64/dynare-preprocessor.tar.gz -C src dynare-preprocessor
......
...@@ -1957,16 +1957,16 @@ ModelTree::compileMEX(const string &basename, const string &funcname, const stri ...@@ -1957,16 +1957,16 @@ ModelTree::compileMEX(const string &basename, const string &funcname, const stri
if (_NSGetExecutablePath(dynare_m_path, &size) == 0) if (_NSGetExecutablePath(dynare_m_path, &size) == 0)
{ {
string str = dynare_m_path; string str = dynare_m_path;
gcc_relative_path = str.substr(0, str.find_last_of("/")) + "/../../.brew/bin/gcc-10"; gcc_relative_path = str.substr(0, str.find_last_of("/")) + "/../../.brew/bin/gcc-11";
} }
if (filesystem::exists(gcc_relative_path)) if (filesystem::exists(gcc_relative_path))
compiler = gcc_relative_path; compiler = gcc_relative_path;
else if (filesystem::exists("/usr/local/bin/gcc-10")) else if (filesystem::exists("/usr/local/bin/gcc-11"))
compiler = "/usr/local/bin/gcc-10"; compiler = "/usr/local/bin/gcc-11";
else else
{ {
cerr << "ERROR: You must install gcc-10 on your system before using the `use_dll` option of Dynare. " cerr << "ERROR: You must install gcc-11 on your system before using the `use_dll` option of Dynare. "
<< "You can do this via the Dynare installation package." << endl; << "You can do this via the Dynare installation package." << endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment