File tree Expand file tree Collapse file tree 7 files changed +19
-26
lines changed Expand file tree Collapse file tree 7 files changed +19
-26
lines changed Original file line number Diff line number Diff line change @@ -290,6 +290,8 @@ jobs:
290290 build-macos :
291291 name : build-macos-${{ matrix.arch }}
292292 runs-on : ${{ (matrix.arch == 'arm64' && 'macos-14') || 'macos-13' }}
293+ env :
294+ VCPKG_BINARY_SOURCES : " clear;x-gha,readwrite"
293295
294296 strategy :
295297 fail-fast : false
@@ -312,27 +314,17 @@ jobs:
312314 run : |
313315 brew install automake autoconf-archive cmake libtool ninja
314316
315- # libcxx build is not working with python >= 3.12
316- - name : Do not use preinstalled python >= 3.12
317- run : |
318- brew uninstall --ignore-dependencies [email protected] 319- [ -e /Library/Frameworks/Python.framework ] && \
320- sudo mv /Library/Frameworks/Python.framework /Library/Frameworks/Python.framework.dont-look-at-this
321- 322- ln -s "$(brew --prefix [email protected] )/bin/python3" "$(brew --prefix [email protected] )/bin/python" 323-
324- - name : Cache - vcpkg
325- uses : actions/cache@v4
317+ - name : Export GitHub Actions cache environment variables
318+ uses : actions/github-script@v7
326319 with :
327- key : ${{ runner.os }}-vcpkg-0
328- path : |
329- $HOME/.cache/vcpkg/archives
320+ script : |
321+ core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
322+ core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
330323
331324 - name : Build
332325 run : |
333326 export LIBTOOLIZE=glibtoolize
334327 export LIBTOOL=glibtool
335- export PATH="$(brew --prefix [email protected] )/bin:$PATH" 336328
337329 ./autogen.sh --with-builtin-tommath --with-builtin-tomcrypt
338330 make -j4
Original file line number Diff line number Diff line change 55SOURCE_PATH=@SOURCE_PATH@
66INSTALL_PREFIX=@INSTALL_PREFIX@
77
8- export MACOSX_DEPLOYMENT_TARGET=10.9
8+ export MACOSX_DEPLOYMENT_TARGET=12.7
99
1010cmake -G Ninja -S $SOURCE_PATH /llvm \
1111 -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
12- -DLLVM_ENABLE_PROJECTS=" libcxx;libcxxabi" \
12+ -DLLVM_ENABLE_PROJECTS=" clang" \
13+ -DLLVM_ENABLE_RUNTIMES=" libcxx;libcxxabi;libunwind" \
1314 -DCMAKE_BUILD_TYPE=Release \
1415 -DLIBCXX_ENABLE_SHARED=false \
1516 -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=true
1617
17- ninja cxx cxxabi
18+ ninja runtimes
1819
1920ninja install-cxx install-cxxabi
Original file line number Diff line number Diff line change 11vcpkg_from_github(
22 OUT_SOURCE_PATH SOURCE_PATH
33 REPO llvm/llvm-project
4- REF 75e33f71c2dae584b13a7d1186ae0a038ba98838
5- HEAD_REF llvmorg-13.0 .1
6- SHA512 8bd80efe88160f615a9dc6fbcdab693d1459ca483410cf990f25169079e46726429f24ad042d287bfcfef8fd54a8a7264a67a710edaa24ebbf1e815a62b1f812
4+ REF d401987fe349a87c53fe25829215b080b70c0c1a
5+ HEAD_REF llvmorg-19.1 .1
6+ SHA512 adbcd783b35c635d6a2e3a97a9a183645645f539bb1771062b69e3b5a8f92250882124c71d3b57b0c206e2efb54415c67fed3e46fb023adff4a2fe17d190b250
77)
88
99file (REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR} /${TARGET_TRIPLET} -dbg" "${CURRENT_BUILDTREES_DIR} /${TARGET_TRIPLET} -rel" )
Original file line number Diff line number Diff line change 11{
22 "name" : " libcxx" ,
3- "version-string" : " 13.0 .1" ,
3+ "version-string" : " 19.1 .1" ,
44 "description" : " LLVM libc++"
55}
Original file line number Diff line number Diff line change 11{
22 "2023-08-23" : {
33 "libcxx" : {
4- "baseline" : " 13.0 .1"
4+ "baseline" : " 19.1 .1"
55 }
66 }
77}
Original file line number Diff line number Diff line change 11{
22 "versions" : [
33 {
4- "version" : " 13.0 .1" ,
5- "path" : " $/ports/libcxx/13.0 .1_0"
4+ "version" : " 19.1 .1" ,
5+ "path" : " $/ports/libcxx/19.1 .1_0"
66 }
77 ]
88}
Original file line number Diff line number Diff line change 1212 },
1313 {
1414 "name" : " libcxx" ,
15- "version" : " 13.0 .1"
15+ "version" : " 19.1 .1"
1616 }
1717 ]
1818}
You can’t perform that action at this time.
0 commit comments