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

Move all js library decisions to a single location #8428

Merged
merged 3 commits into from
Apr 10, 2019
Merged

Move all js library decisions to a single location #8428

merged 3 commits into from
Apr 10, 2019

Conversation

kripken
Copy link
Member

@kripken kripken commented Apr 10, 2019

This was spread out in 2 places before, needlessly.

@kripken kripken requested a review from sbc100 April 10, 2019 21:27
@@ -3156,8 +3156,6 @@ def process_libraries(libs, lib_dirs, settings_changes, input_files):
if not found:
libraries += shared.Building.path_to_system_js_libraries(lib)

# Certain linker flags imply some link libraries to be pulled in by default.
libraries += shared.Building.path_to_system_js_libraries_for_settings(settings_changes)
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think you can also remove the settings_changes arg from this function too.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks, done.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Hmm.. you can also just remove Found completely and return on line 3150?

Copy link
Member Author

Choose a reason for hiding this comment

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

Hmm, yeah, but then we'd need to duplicate the 'SYSTEM_JS_LIBRARIES="' + ','.join(libraries) + '"' line. Not sure which I prefer.

Copy link
Collaborator

Choose a reason for hiding this comment

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

ok lgtm

@kripken kripken merged commit 18bbe44 into incoming Apr 10, 2019
@kripken kripken deleted the single branch April 10, 2019 22:47
VirtualTim pushed a commit to VirtualTim/emscripten that referenced this pull request May 21, 2019
VirtualTim added a commit to VirtualTim/emscripten that referenced this pull request May 23, 2019
VirtualTim added a commit to VirtualTim/emscripten that referenced this pull request May 23, 2019
belraquib pushed a commit to belraquib/emscripten that referenced this pull request Dec 23, 2020
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