@@ -65,8 +65,7 @@ $(build_private_libdir)/corecompiler.ji: $(COMPILER_SRCS)
6565
6666$(build_private_libdir ) /sys.ji : $(build_private_libdir ) /corecompiler.ji $(JULIAHOME ) /VERSION $(BASE_SRCS ) $(STDLIB_SRCS )
6767 @$(call PRINT_JULIA, cd $(JULIAHOME ) /base && \
68- if ! JULIA_BINDIR=$( call cygpath_w,$( build_bindir) ) WINEPATH=" $( call cygpath_w,$( build_bindir) ) ;$$ WINEPATH" \
69- $(call spawn, $(JULIA_EXECUTABLE ) ) -g1 -O0 -C " $( JULIA_CPU_TARGET) " --output-ji $(call cygpath_w,$@ ) .tmp $(JULIA_SYSIMG_BUILD_FLAGS ) \
68+ if ! JULIA_BINDIR=$( call cygpath_w,$( build_bindir) ) $( call spawn, $( JULIA_EXECUTABLE) ) -g1 -O0 -C " $( JULIA_CPU_TARGET) " --output-ji $( call cygpath_w,$@ ) .tmp $( JULIA_SYSIMG_BUILD_FLAGS) \
7069 --startup-file=no --warn-overwrite=yes --sysimage $(call cygpath_w,$< ) sysimg.jl $(RELBUILDROOT ) ; then \
7170 echo ' *** This error might be fixed by running `make clean`. If the error persists$(COMMA) try `make cleanall`. ***' ; \
7271 false ; \
@@ -76,9 +75,8 @@ $(build_private_libdir)/sys.ji: $(build_private_libdir)/corecompiler.ji $(JULIAH
7675define sysimg_builder
7776$$(build_private_libdir ) /sys$1-o.a $$(build_private_libdir ) /sys$1-bc.a : $$(build_private_libdir ) /sys$1-%.a : $$(build_private_libdir ) /sys.ji
7877 @$$(call PRINT_JULIA, cd $$(JULIAHOME ) /base && \
79- if ! JULIA_BINDIR=$$(call cygpath_w,$(build_bindir ) ) WINEPATH="$(call cygpath_w,$(build_bindir ) ) ;$$WINEPATH" \
80- $$(call spawn, $3) $2 -C "$$(JULIA_CPU_TARGET ) " --output-$$* $$(call cygpath_w,$$@ ) .tmp $$(JULIA_SYSIMG_BUILD_FLAGS ) \
81- --startup-file=no --warn-overwrite=yes --sysimage $$(call cygpath_w,$$< ) $$(call cygpath_w,$$(JULIAHOME ) /contrib/generate_precompile.jl) $(JULIA_PRECOMPILE ) ; then \
78+ if ! JULIA_BINDIR=$$(call cygpath_w,$(build_bindir ) ) $$(call spawn, $3) $2 -C "$$(JULIA_CPU_TARGET ) " --output-$$* $$(call cygpath_w,$$@ ) .tmp $$(JULIA_SYSIMG_BUILD_FLAGS ) \
79+ --startup-file=no --warn-overwrite=yes --sysimage $$(call cygpath_w,$$< ) $$(call cygpath_w,$$(JULIAHOME ) /contrib/generate_precompile.jl) $(JULIA_PRECOMPILE ) ; then \
8280 echo '*** This error is usually fixed by running `make clean`. If the error persists$$(COMMA ) try `make cleanall`. *** '; \
8381 false; \
8482 fi )
0 commit comments