Skip to content

Conversation

@eigenraven
Copy link
Collaborator

@eigenraven eigenraven commented Oct 26, 2021

  • Switches to llvm13 compilers for faasm (but does not change the LLVM used by WAVM/WAMR)
  • C++20
  • Conan-based dependency management
  • Cleaned-up CMakeLists

Before ready for merging, needs #522 and faasm/faabric#165 - then dockerfiles must be pointed at the new base containers.

Closes #413

@eigenraven eigenraven force-pushed the cmake-cleanup-2 branch 2 times, most recently from 90bbf3c to 4cad71c Compare October 27, 2021 08:47
@eigenraven eigenraven marked this pull request as ready for review October 27, 2021 15:47
@eigenraven eigenraven requested a review from Shillaker October 27, 2021 15:47
Copy link
Collaborator

@Shillaker Shillaker left a comment

Choose a reason for hiding this comment

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

Overall looks great, couple of small (potential) changes and checks, then once tests have gone through I think it's good to go 👍

@eigenraven
Copy link
Collaborator Author

Due to the bad copy-paste between conf and codegen the container build failed, so I'm restarting it but also now building base and cli locally so that the tests can run earlier

@eigenraven eigenraven force-pushed the cmake-cleanup-2 branch 2 times, most recently from 07ab632 to a0ce53a Compare October 27, 2021 17:20
* WAVM was linking LLVM dynamically while WAMR was doing it statically, resulting in a conflict of static constructors

* dist_test_server was linking to test_utils->Catch2, but it didn't use any of its functions, so the correct symbols never got placed in the executable, and the linker complained about not being able to find Catch2 symbols referenced by the faabric test_utils shared library
@Shillaker Shillaker merged commit 9c5b1ae into master Oct 28, 2021
@Shillaker Shillaker deleted the cmake-cleanup-2 branch October 28, 2021 16:03
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.

Modern CMake

4 participants