Skip to content

Migrate the Makefile to CMake #685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Migrate the Makefile to CMake #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60ec682
Migrate the `Makefile` to CMake
alexcrichton Nov 19, 2025
3d47081
Disable check-symbols by default
alexcrichton Nov 22, 2025
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
6 changes: 0 additions & 6 deletions .github/actions/setup/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,4 @@ runs:
echo "CC=clang-$v" >> $GITHUB_ENV
echo "AR=llvm-ar-$v" >> $GITHUB_ENV
echo "NM=llvm-nm-$v" >> $GITHUB_ENV
# Note: wasm-component-ld is only needed for Linux because
# currently, wasm32-wasip2 is only tested on Linux. If that changes,
# this step will have to be added to the other targets.
curl -fsSLO https://github.com/bytecodealliance/wasm-component-ld/releases/download/v0.5.15/wasm-component-ld-v0.5.15-x86_64-linux.tar.gz
tar xzf wasm-component-ld-v0.5.15-x86_64-linux.tar.gz
echo "$(pwd)/wasm-component-ld-v0.5.15-x86_64-linux" >> $GITHUB_PATH
if: runner.os == 'Linux'
133 changes: 53 additions & 80 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ jobs:
buildlibc:
name: ${{ matrix.name }}
runs-on: ${{ matrix.os }}
env: ${{ matrix.env || fromJSON('{}') }}
strategy:
fail-fast: false
matrix:
Expand All @@ -33,122 +32,101 @@ jobs:
clang_version: 15.0.7
llvm_asset_suffix: arm64-apple-darwin22.0
upload: macos-clang-15
args: -DBUILD_SHARED=OFF -DCMAKE_C_COMPILER_WORKS=ON
- name: Build on Windows x86_64
os: windows-2025
clang_version: 20.1.8
upload: windows-clang-20
args: -DBUILD_SHARED=OFF

# Other versions of LLVM
- name: Build with LLVM 11
os: ubuntu-22.04
clang_version: 11
upload: linux-x86_64-clang-11
env:
BUILD_LIBSETJMP: no
args: -DSETJMP=OFF -DBUILD_SHARED=OFF
- name: Build with LLVM 18
os: ubuntu-24.04
clang_version: 18
upload: linux-x86_64-clang-18
env:
MAKE_TARGETS: "default libc_so"

# Test various combinations of target triples.
#
# Configuration here can happen through `env` which is inherited to
# jobs below. For now this only runs tests on Linux with Clang 16,
# but that can be expanded as necessary in the future too. Note that
# some targets run the build for the `libc_so` makefile target to
# ensure the PIC build works.
# Configuration here can happen through `args` which are all passed
# to CMake. For now this only runs tests on Linux with Clang 16,
# but that can be expanded as necessary in the future too.
- name: Test wasm32-wasi
os: ubuntu-24.04
clang_version: 19
test: true
upload: wasm32-wasi
env:
TARGET_TRIPLE: wasm32-wasi
MAKE_TARGETS: "default libc_so"
args: -DTARGET_TRIPLE=wasm32-wasi

- name: Test wasm32-wasip1
os: ubuntu-24.04
clang_version: 19
test: true
upload: wasm32-wasip1
env:
TARGET_TRIPLE: wasm32-wasip1
MAKE_TARGETS: "default libc_so"
args: -DTARGET_TRIPLE=wasm32-wasip1

- name: Test wasm32-wasip2
os: ubuntu-24.04
clang_version: 19
test: true
upload: wasm32-wasip2
env:
TARGET_TRIPLE: wasm32-wasip2
WASI_SNAPSHOT: p2
MAKE_TARGETS: "default libc_so"
args: -DTARGET_TRIPLE=wasm32-wasip2

- name: Test wasm32-wasip1-threads
os: ubuntu-24.04
clang_version: 19
test: true
upload: wasm32-wasip1-threads
env:
TARGET_TRIPLE: wasm32-wasip1-threads
THREAD_MODEL: posix
args: -DTARGET_TRIPLE=wasm32-wasip1-threads

- name: Test wasm32-wasip1 in V8
os: ubuntu-24.04
clang_version: 19
test: true
test_with_v8: true
env:
TARGET_TRIPLE: wasm32-wasip1
args: -DTARGET_TRIPLE=wasm32-wasip1

- name: Test wasm32-wasip1-threads in V8
os: ubuntu-24.04
clang_version: 19
test: true
test_with_v8: true
env:
TARGET_TRIPLE: wasm32-wasip1-threads
THREAD_MODEL: posix
args: -DTARGET_TRIPLE=wasm32-wasip1-threads

- name: Test wasm32-wasi-simd
os: ubuntu-24.04
clang_version: 19
test: true
upload: wasm32-wasi-simd
env:
TARGET_TRIPLE: wasm32-wasip1
MAKE_TARGETS: "no-check-symbols"
EXTRA_CFLAGS: "-O2 -DNDEBUG -msimd128 -mrelaxed-simd -mbulk-memory -D__wasilibc_simd_string"
args: -DSIMD=ON -DCHECK_SYMBOLS=OFF

- name: Test wasm32-wasip1 (debug)
os: ubuntu-24.04
clang_version: 19
test: true
env:
TARGET_TRIPLE: wasm32-wasip1
DEBUG: true
args: -DCMAKE_BUILD_TYPE=Debug

- name: Test wasm32-wasip2 (debug)
os: ubuntu-24.04
clang_version: 19
test: true
env:
TARGET_TRIPLE: wasm32-wasip2
WASI_SNAPSHOT: p2
DEBUG: true
args: -DCMAKE_BUILD_TYPE=Debug -DTARGET_TRIPLE=wasm32-wasip2

- name: Test wasm32-wasip1-threads (debug)
os: ubuntu-24.04
clang_version: 19
test: true
env:
TARGET_TRIPLE: wasm32-wasip1-threads
THREAD_MODEL: posix
DEBUG: true
args: -DCMAKE_BUILD_TYPE=Debug -DTARGET_TRIPLE=wasm32-wasip1-threads

- name: Test emmalloc
os: ubuntu-24.04
clang_version: 19
test: true
env:
TARGET_TRIPLE: wasm32-wasip1
MALLOC_IMPL: emmalloc
args: -DMALLOC=emmalloc

steps:
- uses: actions/[email protected]
Expand All @@ -160,9 +138,6 @@ jobs:
clang_version: ${{ matrix.clang_version }}
llvm_asset_suffix: ${{ matrix.llvm_asset_suffix }}

- name: Build libc
run: make -j4 $MAKE_TARGETS CHECK_SYMBOLS=yes

- name: Install V8 dependencies
if: matrix.test_with_v8
run: |
Expand All @@ -171,29 +146,29 @@ jobs:
echo ENGINE="$PWD/test/scripts/browser-test/harness.mjs" >> $GITHUB_ENV
echo CTEST_ARGS="--label-exclude v8fail" >> $GITHUB_ENV

- name: Setup testing
if: matrix.test
- name: Configure libc
run: |
cmake -S test -B testbuild -G Ninja \
-DTARGET_TRIPLE=${{ env.TARGET_TRIPLE }} \
-DENGINE=${{ env.ENGINE }} \
-DCMAKE_LINK_DEPENDS_USE_LINKER=OFF \
-DMALLOC_IMPL=${{ env.MALLOC_IMPL }}
cmake -G Ninja -S . -B build \
-DCHECK_SYMBOLS=ON \
${{ matrix.args }} \
-DCMAKE_LINK_DEPENDS_USE_LINKER=OFF

- name: Build tests
- name: Configure testing
if: matrix.test
run: ninja -C testbuild
run: cmake -S . -B build -DBUILD_TESTS=ON -DENGINE=${{ env.ENGINE }}

- name: Build
run: ninja -C build -v

- name: Test
if: matrix.test
run: ctest --test-dir testbuild --output-on-failure -j4 $CTEST_ARGS

run: ctest --test-dir build/test --output-on-failure -j4 $CTEST_ARGS

- uses: actions/[email protected]
if: matrix.upload
with:
name: ${{ format( 'sysroot-{0}.tgz', matrix.upload) }}
path: sysroot
path: build/sysroot


# Disable the headerstest job for now, while WASI transitions from the
Expand Down Expand Up @@ -244,7 +219,8 @@ jobs:
- uses: actions/[email protected]
with:
submodules: true
- run: make bindings
- run: CC=clang cmake -S . -B build -G Ninja
- run: ninja -C build bindings
- run: git diff --exit-code

# Currently wasi-libc's test suite is pretty bare-bones. To try to increase
Expand All @@ -253,42 +229,39 @@ jobs:
# the end this runs at least some Python tests against a from-source-built
# copy of wasi-libc.
python:
name: Test Python
name: Test Python ${{ matrix.name }}
runs-on: ubuntu-24.04-arm
env: ${{ matrix.env || fromJSON('{}') }}
strategy:
fail-fast: false
matrix:
include:
- env:
TARGET_TRIPLE: wasm32-wasip1
- env:
TARGET_TRIPLE: wasm32-wasip2
WASI_SNAPSHOT: p2
- env:
TARGET_TRIPLE: wasm32-wasip1
MALLOC_IMPL: emmalloc
- name: wasm32-wasip1
args: -DTARGET_TRIPLE=wasm32-wasip1
- name: emmalloc
args: -DTARGET_TRIPLE=wasm32-wasip1 -DMALLOC=emmalloc
- name: wasm32-wasip2
args: -DTARGET_TRIPLE=wasm32-wasip2
steps:
- uses: actions/[email protected]
with:
submodules: true
- run: |
curl https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/wasi-sdk-24.0-arm64-linux.tar.gz -L | tar xzvf -
echo "WASI_SDK_PATH=`pwd`/wasi-sdk-24.0-arm64-linux" >> $GITHUB_ENV
curl https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-arm64-linux.tar.gz -L | tar xzvf -
echo "WASI_SDK_PATH=`pwd`/wasi-sdk-25.0-arm64-linux" >> $GITHUB_ENV
if: runner.os == 'Linux'
shell: bash
working-directory: ${{ runner.tool_cache }}
- name: Setup `wasmtime`
uses: bytecodealliance/actions/wasmtime/setup@v1
with:
version: "38.0.3"
- run: make -j4 CC=$WASI_SDK_PATH/bin/clang AR=$WASI_SDK_PATH/bin/llvm-ar
- name: Setup testing
- name: Setup wasi-libc
run: |
cmake -S test -B testbuild -G Ninja \
-DTARGET_TRIPLE=${{ env.TARGET_TRIPLE }} \
cmake -S . -B build -G Ninja \
${{ matrix.args }} \
-DCMAKE_LINK_DEPENDS_USE_LINKER=OFF \
-DPYTHON_TESTS=ON \
-DCMAKE_C_COMPILER=clang
-DBUILD_TESTS=ON \
-DCMAKE_C_COMPILER=$WASI_SDK_PATH/bin/clang
- name: Build and test python
run: ninja -C testbuild python
run: ninja -C build -v python
Loading