From 653ae877074dbdff4d6fd7a8ec585fd451aefeee Mon Sep 17 00:00:00 2001 From: Keno Fischer Date: Tue, 16 Jan 2018 17:20:36 -0500 Subject: [PATCH] Make sure to rebuild compiler when any compiler srcs change Without this patch, changes to any file in compiler/ other than compiler/compiler.jl would not trigger a rebuild of basecompiler.ji, causing you to run with an outdated version of that .ji file (and lots of confusion). --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3fddd6af7d40e..98f4810873720 100644 --- a/Makefile +++ b/Makefile @@ -174,7 +174,7 @@ $(build_private_libdir)/%.$(SHLIB_EXT): $(build_private_libdir)/%.o @$(DSYMUTIL) $@ CORE_SRCS := $(addprefix $(JULIAHOME)/, \ - base/boot.jl base/compiler/compiler.jl \ + base/boot.jl \ base/docs/core.jl \ base/abstractarray.jl \ base/array.jl \ @@ -196,10 +196,11 @@ CORE_SRCS := $(addprefix $(JULIAHOME)/, \ base/reduce.jl \ base/reflection.jl \ base/tuple.jl) +COMPILER_SRCS = $(sort $(shell find $(JULIAHOME)/base/compiler -name \*.jl)) BASE_SRCS := $(sort $(shell find $(JULIAHOME)/base -name \*.jl) $(shell find $(BUILDROOT)/base -name \*.jl)) STDLIB_SRCS := $(sort $(shell find $(JULIAHOME)/stdlib/*/src -name \*.jl)) -$(build_private_libdir)/basecompiler.ji: $(CORE_SRCS) | $(build_private_libdir) +$(build_private_libdir)/basecompiler.ji: $(CORE_SRCS) $(COMPILER_SRCS) | $(build_private_libdir) @$(call PRINT_JULIA, cd $(JULIAHOME)/base && \ $(call spawn,$(JULIA_EXECUTABLE)) -C "$(JULIA_CPU_TARGET)" --output-ji $(call cygpath_w,$@) \ --startup-file=no -g0 -O0 compiler/compiler.jl)