Skip to content

use compnerd/cmake's build of wasi-libc #94

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

Closed
wants to merge 10 commits into from
Closed

use compnerd/cmake's build of wasi-libc #94

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
320d39d
use compnerd/cmake's build of wasi-libc
Jan 13, 2020
84071e4
makefile: invoke cmake for wasi-libc
Jan 14, 2020
a93e176
fix cmake invocation
Jan 14, 2020
011c821
install wasi-libc
Jan 15, 2020
cc17310
makefile: compiler-rt requires libc to be installed to build
Jan 15, 2020
c247403
makefile: point at actual install loc of tools; drop llvm- on ar and nm
Jan 17, 2020
0f1f908
makefile: when building libc, insist that C compiler works
Jan 23, 2020
481c967
makefile: invoke ninja after cmake
Jan 23, 2020
15675d3
i have no idea what im doing.jpg
Jan 24, 2020
84211ae
manually install wasi-libc
Jan 25, 2020
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
13 changes: 9 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,17 @@ build/llvm.BUILT:
touch build/llvm.BUILT

build/wasi-libc.BUILT: build/llvm.BUILT
$(MAKE) -C $(ROOT_DIR)/src/wasi-libc \
WASM_CC=$(PREFIX)/bin/clang \
SYSROOT=$(PREFIX)/share/wasi-sysroot
cmake -G Ninja \
--install \
-DCMAKE_SYSTEM_NAME=Generic \
-DCMAKE_AR=$(ROOT_DIR)/bin/llvm-ar \
-DCMAKE_NM=$(ROOT_DIR)/bin/llvm-nm \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is pre-existing, but we can remove the "llvm-" from these commands, as we install a plain "nm" and "ar" now.

-DCMAKE_C_COMPILER=$(ROOT_DIR)/bin/clang \
-B build/wasi-libc \
-S $(ROOT_DIR)/src/wasi-libc
touch build/wasi-libc.BUILT

build/compiler-rt.BUILT: build/llvm.BUILT
build/compiler-rt.BUILT: build/wasi-libc.BUILT build/llvm.BUILT
mkdir -p build/compiler-rt
cd build/compiler-rt; cmake -G Ninja \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
Expand Down
2 changes: 1 addition & 1 deletion src/wasi-libc
Open in desktop
Submodule wasi-libc updated from f645f4 to d68f3d