Skip to content

link .o files #605

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

Jump to bottom
Merged
merged 14 commits into from
Jul 12, 2023
Merged

link .o files #605

merged 14 commits into from
Jul 12, 2023

Conversation

Be-ing
Copy link
Contributor

@Be-ing Be-ing commented Jul 12, 2023

#600 + some fixes to get #513 to link

@Be-ing Be-ing changed the title Object files link .o files Jul 12, 2023
jimmyvanhest and others added 14 commits July 12, 2023 12:10
@jimmyvanhest @Be-ing
Correctly interpret QT_INSTALL_PREFIX from prl files.
3d31a6e
@jimmyvanhest @Be-ing
Some prl files do not follow the assumed pattern.
af5656d 
Instead look for the files by iterating over the directory entries.
@jimmyvanhest @Be-ing
The libqwasm.prl file must be parsed for the emscripten target.
ecd2c54
@jimmyvanhest @Be-ing
Applied cargo fmt and clippy.
8f4be1b
@jimmyvanhest @Be-ing
Applied requested builder changes
1b753d7
@jimmyvanhest @Be-ing
Expanded documentation about fnd_qt_module
db0a151
@Be-ing
deduplicate linked .o files
f497c91
@jimmyvanhest @Be-ing
cargo_link_libraries is invoked by two crates cxx-qt and cxx-qt-build.
8a05583 
when static linking only one of them is allowed to to add object files else duplicate symbol errors will be produced.
@jimmyvanhest @Be-ing
some external build systems will include object files found by cargo_…
7bd5f06 
…link_libraries and are hard to remove. instead instruct this function to not include these object files.
@jimmyvanhest @Be-ing
Fixed some assumptions with prl file searching by hardcoding android …
356f762 
…architectures.
@jimmyvanhest @Be-ing
Reverted unnecessary changes.
3650853
@Be-ing
cxx-qt-build: add Cargo feature to toggle linking Qt's .o files
3c78079 
Unfortunately, there is no way to get linking to work in every case
without conditional compilation. This feature needs to be enabled
for bin crates or when running `cargo test` for library crates. The
feature must not be enabled when builing a staticlib then linking
it with CMake because CMake will also link the .o files, which
makes linking fail with duplicate symbol errors.
@Be-ing
cxx-qt-build: remove unused link_qt_external feature
d0bab9c
@Be-ing
qt-build-utils: use cc::Build insteaed of Option<cc::Build>
7815508 
Whether to link the .o files is now controlled by a Cargo option,
not the calling code.
ahayzen-kdab
ahayzen-kdab approved these changes Jul 12, 2023
View reviewed changes
Copy link
Collaborator

@ahayzen-kdab ahayzen-kdab left a comment

Choose a reason for hiding this comment

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

LGTM :-)

@ahayzen-kdab ahayzen-kdab enabled auto-merge (rebase) July 12, 2023 17:45
@ahayzen-kdab ahayzen-kdab merged commit 57453a7 into KDAB:main Jul 12, 2023
@Be-ing Be-ing mentioned this pull request Jul 12, 2023
Closed
@Be-ing Be-ing deleted the object_files branch July 12, 2023 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahayzen-kdab ahayzen-kdab ahayzen-kdab approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Be-ing @ahayzen-kdab @jimmyvanhest