From 976b00e92338af12c8459904ef2c3e08e27ae7de Mon Sep 17 00:00:00 2001 From: Jameson Nash Date: Fri, 24 Nov 2017 22:06:03 -0500 Subject: [PATCH 1/3] Link to test/ in source tree (not build tree) Similar to #23997, #24072 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0d5ecfed9a684..e3ae6b1ec591a 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ configure: endif $(foreach dir,$(DIRS),$(eval $(call dir_target,$(dir)))) -$(foreach link,base test,$(eval $(call symlink_target,$(link),$(build_datarootdir)/julia,$(link)))) +$(foreach link,base $(JULIAHOME)/test,$(eval $(call symlink_target,$(link),$(build_datarootdir)/julia,$(notdir $(link))))) build_defaultpkgdir = $(build_datarootdir)/julia/site/$(shell echo $(VERSDIR)) $(eval $(call symlink_target,$(JULIAHOME)/stdlib,$(build_datarootdir)/julia/site,$(shell echo $(VERSDIR)))) From 8df0a7507b846b4cadc0925955f26ddb42249165 Mon Sep 17 00:00:00 2001 From: Jameson Nash Date: Fri, 24 Nov 2017 22:10:41 -0500 Subject: [PATCH 2/3] don't load ~/.juliarc.jl for julia-base-cache target fix #24559 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e3ae6b1ec591a..75604111b4393 100644 --- a/Makefile +++ b/Makefile @@ -225,7 +225,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) $(call cygpath_w,$(JULIAHOME)/etc/write_base_cache.jl) $(call cygpath_w,$(build_datarootdir)/julia/base.cache)) + @$(call spawn,$(JULIA_EXECUTABLE) --startup-file=no $(call cygpath_w,$(JULIAHOME)/etc/write_base_cache.jl) $(call cygpath_w,$(build_datarootdir)/julia/base.cache)) # public libraries, that are installed in $(prefix)/lib JL_LIBS := julia julia-debug From bdbce701e3e2582d2398a6483e2023a24d42d7ae Mon Sep 17 00:00:00 2001 From: Jameson Nash Date: Fri, 24 Nov 2017 22:45:37 -0500 Subject: [PATCH 3/3] fix docs cross-compile Should address Travis-CI macOS build failure, as the docs Makefile was expecting the result of `spawn` to be baked into the JULIA_EXECUTABLE variable --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 75604111b4393..5e8024f60e7dd 100644 --- a/Makefile +++ b/Makefile @@ -108,7 +108,7 @@ julia-debug julia-release : julia-% : julia-ui-% julia-sysimg-% julia-symlink ju debug release : % : julia-% docs: julia-sysimg-$(JULIA_BUILD_MODE) - @$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/doc JULIA_EXECUTABLE=$(JULIA_EXECUTABLE_$(JULIA_BUILD_MODE)) + @$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/doc JULIA_EXECUTABLE='$(call spawn,$(JULIA_EXECUTABLE_$(JULIA_BUILD_MODE)))' check-whitespace: ifneq ($(NO_GIT), 1)