From 46c4328ec742c646f9d7baca816209ae37974738 Mon Sep 17 00:00:00 2001 From: Tim Besard Date: Tue, 28 Jan 2020 22:33:34 +0100 Subject: [PATCH] Make testall target work with JULIA_BUILD_MODE=debug again. (#34402) (cherry picked from commit aa13637bdde6ab517054d40ec4552e3eb3f64f23) --- Make.inc | 6 ++++-- Makefile | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Make.inc b/Make.inc index 09263f6df7116..e3fda16311abc 100644 --- a/Make.inc +++ b/Make.inc @@ -1340,11 +1340,9 @@ endif exec = $(shell $(call spawn,$(1))) JULIA_BUILD_MODE := release -JULIA_LIBSUFFIX:= ifeq (,$(findstring release,$(MAKECMDGOALS))) ifneq (,$(findstring debug,$(MAKECMDGOALS))) JULIA_BUILD_MODE := debug -JULIA_LIBSUFFIX:=-debug endif endif @@ -1352,6 +1350,10 @@ JULIA_EXECUTABLE_debug := $(build_bindir)/julia-debug$(EXE) JULIA_EXECUTABLE_release := $(build_bindir)/julia$(EXE) JULIA_EXECUTABLE := $(JULIA_EXECUTABLE_$(JULIA_BUILD_MODE)) +JULIA_SYSIMG_debug := $(build_private_libdir)/sys-debug.$(SHLIB_EXT) +JULIA_SYSIMG_release := $(build_private_libdir)/sys.$(SHLIB_EXT) +JULIA_SYSIMG := $(JULIA_SYSIMG_$(JULIA_BUILD_MODE)) + # Colors for make ifndef VERBOSE VERBOSE := 0 diff --git a/Makefile b/Makefile index 44c053ec3230f..df2e9c26ac3e6 100644 --- a/Makefile +++ b/Makefile @@ -571,8 +571,6 @@ distcleanall: cleanall test: check-whitespace $(JULIA_BUILD_MODE) @$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/test default JULIA_BUILD_MODE=$(JULIA_BUILD_MODE) -JULIA_SYSIMG=$(build_private_libdir)/sys$(JULIA_LIBSUFFIX).$(SHLIB_EXT) - testall: check-whitespace $(JULIA_BUILD_MODE) cp $(JULIA_SYSIMG) $(BUILDROOT)/local.$(SHLIB_EXT) $(call spawn,$(JULIA_EXECUTABLE) -J $(call cygpath_w,$(BUILDROOT)/local.$(SHLIB_EXT)) -e 'true')