| author |  Jakub Konka <kubkon@jakubkonka.com> 2021-11-28 11:07:19+01:00 |
| committer |  Andrew Kelley <andrew@ziglang.org> 2021-11-28 21:10:33-08:00 |
| log | 2ca5a859e9f5148a09928803cc2d109440a8067c |
| tree | 4f0bc0cc9eb117c1726a8342b8ab093c3526bba2 |
| parent | a4aff36fb3d397459de16426ce51cdbd3c5cb0cc |
Force static libncurses in CMakeLists when static zig on macos
Add additional search paths pointing at homebrew prefixes as Apple
doesn't ship a static libncurses for linking - only a stub for dynamic
linking `libncurses.tbd`.3 files changed, 6 insertions(+), 3 deletions(-)
CMakeLists.txt+4-1
| ... | @@ -116,7 +116,10 @@ endif() | ... | @@ -116,7 +116,10 @@ endif() |
| 116 | 116 | ||
| 117 | if(APPLE AND ZIG_STATIC) | 117 | if(APPLE AND ZIG_STATIC) |
| 118 | list(REMOVE_ITEM LLVM_LIBRARIES "-lcurses") | 118 | list(REMOVE_ITEM LLVM_LIBRARIES "-lcurses") |
| 119 | find_library(CURSES NAMES libcurses.a curses libcurses libncurses.a ncurses libncurses) | 119 | find_library(CURSES NAMES libcurses.a libncurses.a |
| 120 | PATHS | ||
| 121 | /usr/local/opt/ncurses/lib | ||
| 122 | /opt/homebrew/opt/ncurses/lib) | ||
| 120 | list(APPEND LLVM_LIBRARIES "${CURSES}") | 123 | list(APPEND LLVM_LIBRARIES "${CURSES}") |
| 121 | endif() | 124 | endif() |
| 122 | 125 |
ci/azure/macos_arm64_script+1-1
| ... | @@ -3,7 +3,7 @@ | ... | @@ -3,7 +3,7 @@ |
| 3 | set -x | 3 | set -x |
| 4 | set -e | 4 | set -e |
| 5 | 5 | ||
| 6 | brew update && brew install s3cmd | 6 | brew update && brew install ncurses s3cmd |
| 7 | 7 | ||
| 8 | ZIGDIR="$(pwd)" | 8 | ZIGDIR="$(pwd)" |
| 9 | 9 |
ci/azure/macos_script+1-1
| ... | @@ -3,7 +3,7 @@ | ... | @@ -3,7 +3,7 @@ |
| 3 | set -x | 3 | set -x |
| 4 | set -e | 4 | set -e |
| 5 | 5 | ||
| 6 | brew update && brew install s3cmd | 6 | brew update && brew install ncurses s3cmd |
| 7 | 7 | ||
| 8 | ZIGDIR="$(pwd)" | 8 | ZIGDIR="$(pwd)" |
| 9 | ARCH="x86_64" | 9 | ARCH="x86_64" |