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

More Makefile definitions for targeting emscripten #32482

Merged
merged 1 commit into from
Jul 4, 2019
Merged

Conversation

Keno
Copy link
Member

@Keno Keno commented Jul 2, 2019

No description provided.

@Keno Keno requested review from staticfloat and vchuravy July 2, 2019 20:42
Makefile Outdated
@@ -147,7 +147,7 @@ $(build_depsbindir)/stringreplace: $(JULIAHOME)/contrib/stringreplace.c | $(buil
@$(call PRINT_CC, $(HOSTCC) -o $(build_depsbindir)/stringreplace $(JULIAHOME)/contrib/stringreplace.c)

julia-base-cache: julia-sysimg-$(JULIA_BUILD_MODE) | $(DIRS) $(build_datarootdir)/julia
@$(call spawn,$(JULIA_EXECUTABLE) --startup-file=no $(call cygpath_w,$(JULIAHOME)/etc/write_base_cache.jl) \
@$(call spawn,$JULIA_BINDIR=$(build_bindir) (JULIA_EXECUTABLE) --startup-file=no $(call cygpath_w,$(JULIAHOME)/etc/write_base_cache.jl) \
Copy link
Member

Choose a reason for hiding this comment

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

I think this $JULIA_BINDIR is a mistake; I'm pretty sure that will expand to ULIA_BINDIR.

Copy link
Member Author

Choose a reason for hiding this comment

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

oops, thanks

Copy link
Member

Choose a reason for hiding this comment

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

This also broke building with wine:

cd /mnt/julia/base && if ! wine JULIA_BINDIR=`winepath -w /mnt/build/usr/bin` /mnt/build/usr/bin/julia.exe -g1 -O0 -C "pentium4" --output-ji `winepath -w /mnt/build/usr/lib/julia/sys.ji`.tmp  --startup-file=no --warn-overwrite=yes --sysimage `winepath -w /mnt/build/usr/lib/julia/corecompiler.ji` sysimg.jl ../../build/base/; then echo '*** This error might be fixed by running `make clean`. If the error persists, try `make cleanall`. ***'; false; fi
wine: cannot find 'JULIA_BINDIR=Z:\mnt\build\usr\bin'

@Keno Keno force-pushed the kf/emscriptenmake branch from b8beec6 to 20a1268 Compare July 3, 2019 20:58
@Keno Keno merged commit 0060e13 into master Jul 4, 2019
@martinholters martinholters deleted the kf/emscriptenmake branch July 4, 2019 21:46
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.

4 participants