Skip to content

Enable windows bundled sysdeps. #398

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

Merged
merged 5 commits into from
Apr 11, 2025
Merged

Enable windows bundled sysdeps. #398

merged 5 commits into from
Apr 11, 2025

Conversation

stellaraccident
Copy link
Collaborator

  • Enabled the bundled sysdeps mode by default on Windows, adding the sqlite3 (which was already in common) and zlib libraries.
  • I believe this fixes the root cause from Investigate why zlib detection fails in amd-llvm #375 without requiring an LLVM patch:
    • LLVM was expecting the CMake ZLIB package to advertise a loose ZLIB_LIBRARY and ZLIB_INCLUDE_DIRS, but our version was not. This was causing the check_symbol_exists() to fail, even though the package was found.
    • Includes the zlib FORCE_ON change from amd-llvm: actually link with zlib #342 and should supercede the need for that patch.
  • Also ports the zlib patch script from bash->python and uses it from both the linux and windows build.
  • May need another tweak or two on the Linux side: since I developed this on Windows, I was just eyeballing Linux.

Fixes #375
Supersedes #342

* Enables sqlite3, since it was already mostly set up for cross-platform. Configured it to produce a static library on Windows, per tradition.
Copy link
Member

@ScottTodd ScottTodd left a comment

Choose a reason for hiding this comment

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

Nice, thanks!

@stellaraccident
Copy link
Collaborator Author

Ugh, looks like an additional windows PIC issue.

@stellaraccident
Copy link
Collaborator Author

Ugh, looks like an additional windows PIC issue.

Fixed that. Need to pull this branch up on Linux tmw and triage that side before landing. Probably a silly tweak needed.

@stellaraccident
Copy link
Collaborator Author

Ugh, looks like an additional windows PIC issue.

Fixed that. Need to pull this branch up on Linux tmw and triage that side before landing. Probably a silly tweak needed.

Ok, that should do it. It is amazing how many ways there are to misspell a one-letter library name.

@stellaraccident stellaraccident merged commit 837df0a into main Apr 11, 2025
5 checks passed
@stellaraccident stellaraccident deleted the windows_sysdeps branch April 11, 2025 04:29
@github-project-automation github-project-automation bot moved this from TODO to Done in TheRock Triage Apr 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Investigate why zlib detection fails in amd-llvm
2 participants