Skip to content

Commit

Permalink
don't need or want to link libc++ for zlib as it is a c library
Browse files Browse the repository at this point in the history
  • Loading branch information
lkeegan committed Aug 14, 2023
1 parent d6a3ce6 commit 5780d4e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ jobs:
MACOSX_DEPLOYMENT_TARGET: "11.0"
CONFIGURE_EXTRAS: ""
OS: "osx"
CXX: "clang++-16"
CC: "clang-16"
# CXX: "clang++-16"
# CC: "clang-16"
defaults:
run:
shell: bash
Expand Down
6 changes: 2 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ export PATH="/usr/local/opt/llvm/bin:$PATH"
export LDFLAGS="-L/usr/local/opt/llvm/lib"
export CPPFLAGS="-I/usr/local/opt/llvm/include"

ls /usr/local/opt/llvm/lib/

echo "QT_VERSION = $QT_VERSION"
echo "ZLIB_VERSION: ${ZLIB_VERSION}"
echo "INSTALL_PREFIX = $INSTALL_PREFIX"
Expand All @@ -16,6 +14,8 @@ echo "SUDO_CMD = $SUDO_CMD"
echo "CONFIGURE_EXTRAS = $CONFIGURE_EXTRAS"
echo "OS=$OS"
echo "PATH=$PATH"
which clang
clang --version
which clang++
clang++ --version
# make qt dir
Expand All @@ -34,8 +34,6 @@ cmake -G "Ninja" .. \
-DBUILD_SHARED_LIBS=OFF \
-DCMAKE_C_FLAGS="-fpic -fvisibility=hidden" \
-DCMAKE_CXX_FLAGS="-fpic -fvisibility=hidden" \
-DCMAKE_EXE_LINKER_FLAGS="-L/usr/local/opt/llvm/lib/c++ -Wl,-rpath,/usr/local/opt/llvm/lib/c++" \
-DCMAKE_STATIC_LINKER_FLAGS="-L/usr/local/opt/llvm/lib/c++ -Wl,-rpath,/usr/local/opt/llvm/lib/c++" \
-DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX"
time ninja zlibstatic
# manual install to avoid shared libs being installed & issues with compiling example programs
Expand Down

0 comments on commit 5780d4e

Please sign in to comment.