Skip to content

Commit b29d951

Browse files
authored
Makefile cleanups (JuliaLang#33826)
fix JuliaLang#32852
1 parent cf5b905 commit b29d951

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,8 @@ distcleanall: cleanall
560560
julia-debug julia-release julia-stdlib julia-deps julia-deps-libs \
561561
julia-ui-release julia-ui-debug julia-src-release julia-src-debug \
562562
julia-symlink julia-base julia-sysimg julia-sysimg-ji julia-sysimg-release julia-sysimg-debug \
563-
test testall testall1 test clean distcleanall cleanall clean-* \
563+
test testall testall1 test test-* test-revise-* \
564+
clean distcleanall cleanall clean-* \
564565
run-julia run-julia-debug run-julia-release run \
565566
install binary-dist light-source-dist.tmp light-source-dist \
566567
dist full-source-dist source-dist

src/flisp/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,12 @@ $(BUILDDIR)/host/Makefile:
110110
$(BUILDDIR)/host/$(EXENAME): $(BUILDDIR)/host/Makefile
111111
make -C $(BUILDDIR)/host $(EXENAME)
112112

113-
ifneq ($(BUILDDIR)$(BUILDING_HOST_TOOLS),.)
113+
ifneq ($(BUILDDIR),.)
114+
ifneq ($(BUILDDIR),$(SRCDIR))
114115
$(BUILDDIR)/flisp.boot: $(SRCDIR)/flisp.boot | $(BUILDDIR)
115116
cp $< $@
116117
endif
118+
endif
117119

118120
test:
119121
ifneq ($(USEMSVC), 1)

test/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ $(TESTS):
2525
@cd $(SRCDIR) && \
2626
$(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no ./runtests.jl $@)
2727

28-
$(addprefix revise-, $(TESTS)):
28+
$(addprefix revise-, $(TESTS)): revise-% :
2929
@cd $(SRCDIR) && \
30-
$(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no ./runtests.jl --revise $(subst revise-,,$@))
30+
$(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no ./runtests.jl --revise $*)
3131

3232
embedding:
3333
@$(MAKE) -C $(SRCDIR)/$@ check $(EMBEDDING_ARGS)
@@ -39,4 +39,4 @@ clean:
3939
@$(MAKE) -C embedding $@ $(EMBEDDING_ARGS)
4040
@$(MAKE) -C gcext $@ $(GCEXT_ARGS)
4141

42-
.PHONY: $(TESTS) embedding gcext clean
42+
.PHONY: $(TESTS) $(addprefix revise-, $(TESTS)) embedding gcext clean

0 commit comments

Comments
 (0)