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

EMCC_LOCAL_PORTS fixes for multiple ports being used #9788

Merged
merged 4 commits into from Nov 11, 2019
Merged

EMCC_LOCAL_PORTS fixes for multiple ports being used #9788

merged 4 commits into from Nov 11, 2019

Conversation

@kripken
Copy link
Member

kripken commented Nov 5, 2019

Only copy files if they are newer, avoiding rebuilding the entire
port on each object file.

In each call to fetch_project() handle it only if it is in the list of
local ports.

Fixes #9342

cc @Beuc - this fixes your testcase (but I replaced -lSDL2_image with -s USE_SDL_IMAGE=2)

…call to fetch_project() handle just it only if it is in the list of local ports
@Beuc

This comment has been minimized.

Copy link
Contributor

Beuc commented Nov 5, 2019

Thanks! This display "using local ports: sdl2=xxx/build/SDL2" about 30-40 times, but -- it works.

but I replaced -lSDL2_image with -s USE_SDL_IMAGE=2

my bad!

@kripken

This comment has been minimized.

Copy link
Member Author

kripken commented Nov 6, 2019

@Beuc Yeah, the output is kind of excessive, I agree. I figure it's safer to err on the side of more logging for now, as this may not be totally stable yet.

@kripken kripken requested a review from sbc100 Nov 7, 2019
@kripken

This comment has been minimized.

Copy link
Member Author

kripken commented Nov 7, 2019

@sbc100 maybe you have a better idea for where to put the new get_all_files_under etc. helpers?

@sbc100
sbc100 approved these changes Nov 11, 2019
tools/shared.py Outdated Show resolved Hide resolved
tools/shared.py Outdated Show resolved Hide resolved
tools/system_libs.py Show resolved Hide resolved
@sbc100
sbc100 approved these changes Nov 11, 2019
@kripken kripken merged commit ac5b5a7 into incoming Nov 11, 2019
29 of 30 checks passed
29 of 30 checks passed
ci/circleci: test-upstream-browser-firefox Your tests failed on CircleCI
Details
ci/circleci: build Your tests passed on CircleCI!
Details
ci/circleci: build-docs Your tests passed on CircleCI!
Details
ci/circleci: build-upstream-linux Your tests passed on CircleCI!
Details
ci/circleci: build-upstream-mac Your tests passed on CircleCI!
Details
ci/circleci: flake8 Your tests passed on CircleCI!
Details
ci/circleci: test-ab Your tests passed on CircleCI!
Details
ci/circleci: test-browser-chrome Your tests passed on CircleCI!
Details
ci/circleci: test-browser-firefox Your tests passed on CircleCI!
Details
ci/circleci: test-c Your tests passed on CircleCI!
Details
ci/circleci: test-d Your tests passed on CircleCI!
Details
ci/circleci: test-e Your tests passed on CircleCI!
Details
ci/circleci: test-f Your tests passed on CircleCI!
Details
ci/circleci: test-ghi Your tests passed on CircleCI!
Details
ci/circleci: test-jklmno Your tests passed on CircleCI!
Details
ci/circleci: test-other Your tests passed on CircleCI!
Details
ci/circleci: test-p Your tests passed on CircleCI!
Details
ci/circleci: test-qrst Your tests passed on CircleCI!
Details
ci/circleci: test-sanity Your tests passed on CircleCI!
Details
ci/circleci: test-upstream-browser-chrome Your tests passed on CircleCI!
Details
ci/circleci: test-upstream-other Your tests passed on CircleCI!
Details
ci/circleci: test-upstream-other-mac Your tests passed on CircleCI!
Details
ci/circleci: test-upstream-wasm0 Your tests passed on CircleCI!
Details
ci/circleci: test-upstream-wasm2 Your tests passed on CircleCI!
Details
ci/circleci: test-upstream-wasm2js1 Your tests passed on CircleCI!
Details
ci/circleci: test-upstream-wasm3 Your tests passed on CircleCI!
Details
ci/circleci: test-uvwxyz Your tests passed on CircleCI!
Details
ci/circleci: test-wasm0 Your tests passed on CircleCI!
Details
ci/circleci: test-wasm2 Your tests passed on CircleCI!
Details
ci/circleci: test-wasm3 Your tests passed on CircleCI!
Details
@kripken kripken deleted the lp branch Nov 11, 2019
google-feinberg added a commit to google-feinberg/emscripten that referenced this pull request Dec 1, 2019
…#9788)

Only copy files if they are newer, avoiding rebuilding the entire
port on each object file.

In each call to fetch_project() handle it only if it is in the list of
local ports.

Fixes emscripten-core#9342
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.