Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,8 @@ jobs:
build-macos:
name: build-macos-${{ matrix.arch }}
runs-on: ${{ (matrix.arch == 'arm64' && 'macos-14') || 'macos-13' }}
env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"

strategy:
fail-fast: false
Expand All @@ -312,27 +314,17 @@ jobs:
run: |
brew install automake autoconf-archive cmake libtool ninja

# libcxx build is not working with python >= 3.12
- name: Do not use preinstalled python >= 3.12
run: |
brew uninstall --ignore-dependencies python@3.12
[ -e /Library/Frameworks/Python.framework ] && \
sudo mv /Library/Frameworks/Python.framework /Library/Frameworks/Python.framework.dont-look-at-this
brew install python@3.11
ln -s "$(brew --prefix python@3.11)/bin/python3" "$(brew --prefix python@3.11)/bin/python"

- name: Cache - vcpkg
uses: actions/cache@v4
- name: Export GitHub Actions cache environment variables
uses: actions/github-script@v7
with:
key: ${{ runner.os }}-vcpkg-0
path: |
$HOME/.cache/vcpkg/archives
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');

- name: Build
run: |
export LIBTOOLIZE=glibtoolize
export LIBTOOL=glibtool
export PATH="$(brew --prefix python@3.11)/bin:$PATH"

./autogen.sh --with-builtin-tommath --with-builtin-tomcrypt
make -j4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@ set -e
SOURCE_PATH=@SOURCE_PATH@
INSTALL_PREFIX=@INSTALL_PREFIX@

export MACOSX_DEPLOYMENT_TARGET=10.9
export MACOSX_DEPLOYMENT_TARGET=12.7

cmake -G Ninja -S $SOURCE_PATH/llvm \
-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
-DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \
-DLLVM_ENABLE_PROJECTS="clang" \
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \
-DCMAKE_BUILD_TYPE=Release \
-DLIBCXX_ENABLE_SHARED=false \
-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=true

ninja cxx cxxabi
ninja runtimes

ninja install-cxx install-cxxabi
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO llvm/llvm-project
REF 75e33f71c2dae584b13a7d1186ae0a038ba98838
HEAD_REF llvmorg-13.0.1
SHA512 8bd80efe88160f615a9dc6fbcdab693d1459ca483410cf990f25169079e46726429f24ad042d287bfcfef8fd54a8a7264a67a710edaa24ebbf1e815a62b1f812
REF d401987fe349a87c53fe25829215b080b70c0c1a
HEAD_REF llvmorg-19.1.1
SHA512 adbcd783b35c635d6a2e3a97a9a183645645f539bb1771062b69e3b5a8f92250882124c71d3b57b0c206e2efb54415c67fed3e46fb023adff4a2fe17d190b250
)

file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "libcxx",
"version-string": "13.0.1",
"version-string": "19.1.1",
"description": "LLVM libc++"
}
2 changes: 1 addition & 1 deletion vcpkg-custom/registry/versions/baseline.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"2023-08-23": {
"libcxx": {
"baseline": "13.0.1"
"baseline": "19.1.1"
}
}
}
4 changes: 2 additions & 2 deletions vcpkg-custom/registry/versions/l-/libcxx.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"versions": [
{
"version": "13.0.1",
"path": "$/ports/libcxx/13.0.1_0"
"version": "19.1.1",
"path": "$/ports/libcxx/19.1.1_0"
}
]
}
2 changes: 1 addition & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
{
"name": "libcxx",
"version": "13.0.1"
"version": "19.1.1"
}
]
}
Loading