Skip to content

Commit

Permalink
mac: Don't link clang-format against /usr/lib/libncurses.5.4.dylib
Browse files Browse the repository at this point in the history
No behavior change, just slightly tidier `otool -L` output. And matches
what we do on Linux.

Bug: none
Change-Id: I5229ad1b90ff6fcb5a8e9909ddc584a9d38b7c37
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2788030
Auto-Submit: Nico Weber <thakis@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Reviewed-by: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#867073}
  • Loading branch information
nico authored and Chromium LUCI CQ committed Mar 28, 2021
1 parent 3d814ed commit f092a0e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion buildtools/mac/clang-format.sha1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ae6765c699ed32e9dca305645456dcdf5cda0438
12625542faa127039e54b0d97efd5c29ce97f275
3 changes: 2 additions & 1 deletion docs/updating_clang_format_binaries.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ MACOSX_DEPLOYMENT_TARGET=10.9 cmake -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-DLLVM_ENABLE_PROJECTS=clang \
-DLLVM_ENABLE_ASSERTIONS=NO \
-DLLVM_ENABLE_TERMINFO=OFF \
-DLLVM_ENABLE_THREADS=NO \
'-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64' \
../llvm/
Expand All @@ -74,11 +75,11 @@ cmake -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-DLLVM_ENABLE_PROJECTS=clang \
-DLLVM_ENABLE_ASSERTIONS=NO \
-DLLVM_ENABLE_TERMINFO=OFF \
-DLLVM_ENABLE_THREADS=NO \
-DCMAKE_C_COMPILER=$PWD/../../chromium/src/third_party/llvm-build/Release+Asserts/bin/clang \
-DCMAKE_CXX_COMPILER=$PWD/../../chromium/src/third_party/llvm-build/Release+Asserts/bin/clang++ \
-DCMAKE_ASM_COMPILER=$PWD/../../chromium/src/third_party/llvm-build/Release+Asserts/bin/clang \
-DLLVM_ENABLE_TERMINFO=OFF \
-DCMAKE_CXX_STANDARD_LIBRARIES="-static-libgcc -static-libstdc++" \
../llvm/

Expand Down

0 comments on commit f092a0e

Please sign in to comment.