Skip to content

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

Merged
abrown merged 1 commit intoWebAssembly:mainfrom
anuraaga:docker-cmake-pthread
Aug 22, 2023
Merged

Add wasi-sdk-pthread.cmake to docker image to allow enabling it with env#339
abrown merged 1 commit intoWebAssembly:mainfrom
anuraaga:docker-cmake-pthread

Conversation

@anuraaga
Copy link
Copy Markdown
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?

Comment thread docker/wasi-sdk.cmake
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
Copy Markdown
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
Copy Markdown
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
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