Skip to content

Commit 837c5d0

Browse files
committed
[FOLD] move libcxx workflow into llvm workflow
1 parent fc72f60 commit 837c5d0

File tree

2 files changed

+4
-24
lines changed

2 files changed

+4
-24
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ jobs:
7272
llvm-archive-basename: llvm-{{ os }}-{{ llvm-build-preset-prefix }}-{{ llvm-id }}
7373
llvm-archive-extension: {{#if (ieq os 'windows') }}7z{{else}}tar.bz2{{/if}}
7474
llvm-archive-filename: {{ llvm-archive-basename }}.{{ llvm-archive-extension }}
75-
libcxx-runtimes: libcxx;libcxxabi{{#if (ine os 'windows') }};libunwind{{/if}}
76-
libcxx-targets: cxx install-cxx
77-
libcxx-cxxflags: {{#if (ieq os 'windows') }}-D__ORDER_LITTLE_ENDIAN__=1234 -D__ORDER_BIG_ENDIAN__=4321 -D__BYTE_ORDER__=__ORDER_LITTLE_ENDIAN__{{/if}}
78-
libcxx-cmake-args: -D LLVM_ENABLE_PROJECTS_USED=ON -D LLVM_ENABLE_RUNTIMES="{{ libcxx-runtimes }}" -D LIBCXX_CXX_ABI=libcxxabi {{#if (ieq os 'windows') }}-D LIBCXXABI_USE_LLVM_UNWINDER=OFF -D LIBCXXABI_ENABLE_SHARED=OFF -D LIBCXXABI_ENABLE_STATIC=ON -D LIBCXX_ENABLE_SHARED=OFF -D LIBCXX_ENABLE_STATIC=ON -D LIBCXX_NO_VCRUNTIME=ON{{/if}} {{#if (ieq os 'macos') }}-D CMAKE_OSX_ARCHITECTURES=""{{/if}}
7975
mrdocs-ccflags: {{ ccflags }} {{#if (eq compiler 'gcc') }}-static{{/if}} {{#if asan }}-static-libasan{{/if}} {{#if tsan }}-static-libtsan{{/if}}
8076
mrdocs-cxxflags: {{ cxxflags }} {{#if (eq compiler 'gcc') }}-static{{/if}} {{#if asan }}-static-libasan{{/if}} {{#if tsan }}-static-libtsan{{/if}}
8177
mrdocs-package-generators: {{#if (ieq os 'windows') }}7Z ZIP WIX{{else}}TGZ TXZ{{/if}}
@@ -332,25 +328,6 @@ jobs:
332328
run-tests: false
333329
trace-commands: true
334330

335-
- name: Install LibC++
336-
uses: alandefreitas/cpp-actions/[email protected]
337-
if: steps.llvm-cache.outputs.cache-hit != 'true' && steps.llvm-download.outputs.found != 'true'
338-
with:
339-
cmake-version: '>=3.26'
340-
source-dir: ../third-party/llvm-project/runtimes
341-
build-dir: ${sourceDir}/build-libcxx
342-
build-target: ${{ matrix.libcxx-targets }}
343-
# MrDocs will only use the LibC++ headers: any compiler that works in this workflow will do
344-
cc: ${{ runner.os == 'macOS' && steps.setup-cpp.outputs.cc || '../third-party/llvm-project/install/bin/clang' }}
345-
cxx: ${{ runner.os == 'macOS' && steps.setup-cpp.outputs.cxx || '../third-party/llvm-project/install/bin/clang++' }}
346-
cxxflags: ${{ matrix.libcxx-cxxflags }}
347-
generator: Ninja
348-
extra-args: ${{ matrix.libcxx-cmake-args }}
349-
install: true
350-
install-prefix: ${sourceDir}/../install
351-
run-tests: false
352-
trace-commands: true
353-
354331
- name: Install Node.js
355332
uses: actions/setup-node@v4
356333
with:

third-party/llvm/CMakePresets.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
"cacheVariables": {
1515
"CMAKE_BUILD_TYPE": "Debug",
1616
"LLVM_ENABLE_PROJECTS": "clang",
17+
"LLVM_ENABLE_RUNTIMES": "libcxx;libcxxabi;libunwind",
18+
"LLVM_ENABLE_PROJECTS_USED": true,
1719
"LLVM_TARGETS_TO_BUILD": "X86",
1820
"LLVM_UNREACHABLE_OPTIMIZE": false,
1921
"LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION": false,
@@ -25,7 +27,7 @@
2527
"LLVM_INCLUDE_BENCHMARKS": false,
2628
"LLVM_INCLUDE_DOCS": false,
2729
"LLVM_INCLUDE_EXAMPLES": false,
28-
"LLVM_INCLUDE_RUNTIMES": false,
30+
"LLVM_INCLUDE_RUNTIMES": true,
2931
"LLVM_INCLUDE_TESTS": false,
3032
"LLVM_INCLUDE_TOOLS": true,
3133
"LLVM_INCLUDE_UTILS": true,
@@ -46,6 +48,7 @@
4648
"CLANG_INCLUDE_TESTS": false,
4749
"CLANG_INCLUDE_DOCS": false,
4850
"CLANG_BUILD_EXAMPLES": false,
51+
"LIBCXX_CXX_ABI": "libcxxabi",
4952
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}"
5053
}
5154
},

0 commit comments

Comments
 (0)