Skip to content

Commit 6e2ba26

Browse files
authored
Add MINIMAL target to embuilder for using in CI. NFC (emscripten-core#10498)
I noticed as part of emscripten-core#10490 that this list was missing a couple of items but I would be a lot nicer to maintain in central location. This change doesn't add anything, just centralizes the list.
1 parent 9c86181 commit 6e2ba26

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

.circleci/config.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,10 @@ commands:
6868
$PYTHON_BIN ./embuilder.py build ALL
6969
$PYTHON_BIN tests/runner.py test_hello_world
7070
- run:
71+
7172
name: embuilder (LTO)
7273
command: |
73-
$PYTHON_BIN ./embuilder.py build libcompiler_rt libc libc++abi libc++abi-noexcept libc++ libc++-noexcept libal libdlmalloc libdlmalloc-debug libemmalloc libemmalloc-64bit libpthread_stub libc_rt_wasm struct_info libc-wasm --lto
74+
$PYTHON_BIN ./embuilder.py build MINIMAL --lto
7475
$PYTHON_BIN tests/runner.py test_hello_world
7576
- run:
7677
name: embuilder (PIC)
@@ -80,7 +81,7 @@ commands:
8081
- run:
8182
name: embuilder (PIC+LTO)
8283
command: |
83-
$PYTHON_BIN ./embuilder.py build libcompiler_rt libc libc++abi libc++abi-noexcept libc++ libc++-noexcept libal libdlmalloc libdlmalloc-debug libemmalloc libemmalloc-64bit libpthread_stub libc_rt_wasm struct_info libc-wasm --pic --lto
84+
$PYTHON_BIN ./embuilder.py build MINIMAL --pic --lto
8485
$PYTHON_BIN tests/runner.py test_hello_world
8586
- run:
8687
name: freeze cache

embuilder.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,25 @@
2727
# It is not a system library, but it needs to be built before running with FROZEN_CACHE.
2828
SYSTEM_TASKS += ['struct_info']
2929

30+
# Minimal subset of SYSTEM_TASKS used by CI systems to build enough to useful
31+
MINIMAL_TASKS = [
32+
'libcompiler_rt',
33+
'libc',
34+
'libc++abi',
35+
'libc++abi-noexcept',
36+
'libc++',
37+
'libc++-noexcept',
38+
'libal',
39+
'libdlmalloc',
40+
'libdlmalloc-debug',
41+
'libemmalloc',
42+
'libemmalloc-64bit',
43+
'libpthread_stub',
44+
'libc_rt_wasm',
45+
'struct_info',
46+
'libc-wasm'
47+
]
48+
3049
USER_TASKS = [
3150
'binaryen',
3251
'boost_headers',
@@ -162,6 +181,9 @@ def main():
162181
elif 'USER' in tasks:
163182
tasks = USER_TASKS
164183
auto_tasks = True
184+
elif 'MINIMAL' in tasks:
185+
tasks = MINIMAL_TASKS
186+
auto_tasks = True
165187
elif 'ALL' in tasks:
166188
tasks = SYSTEM_TASKS + USER_TASKS
167189
auto_tasks = True

0 commit comments

Comments
 (0)