Skip to content
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.

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

Add wasi-sdk-pthread.cmake to docker image to allow enabling it with env #339

Merged
merged 1 commit into from
Aug 22, 2023

Conversation

anuraaga
Copy link
Contributor

@anuraaga anuraaga commented Aug 9, 2023

TBH, I'm not sure what to think of this change as it does seem to bring the number of cmake files in this repo to an incredible level. But the docker image is the easiest way to just try building a repo with WASI (e.g., abseil/abseil-cpp#1509), and being able to just export CMAKE_TOOKCHAIN_FILE=/usr/share/cmake/wasi-sdk-pthread.cmake would be a great boon. What do you think?

@@ -18,6 +18,7 @@ set(CMAKE_AR /usr/bin/llvm-ar-$ENV{LLVM_VERSION})
set(CMAKE_RANLIB /usr/bin/llvm-ranlib-$ENV{LLVM_VERSION})
set(CMAKE_C_COMPILER_TARGET ${triple})
set(CMAKE_CXX_COMPILER_TARGET ${triple})
set(CMAKE_ASM_COMPILER_TARGET ${triple})
Copy link
Contributor Author

Choose a reason for hiding this comment

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

When cribbing from top-level cmake file, I noticed this line was there that hadn't been added here

Copy link
Collaborator

@abrown abrown left a comment

Choose a reason for hiding this comment

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

@sunfishcode and I are here looking at this and this seems OK--let's merge it!

@abrown abrown merged commit fd20cf5 into WebAssembly:main Aug 22, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants