Skip to content

Commit

Permalink
Makefile cleanups (#33826)
Browse files Browse the repository at this point in the history
fix #32852
  • Loading branch information
vtjnash authored and KristofferC committed Apr 11, 2020
1 parent 457a2d5 commit 810f8df
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,8 @@ distcleanall: cleanall
julia-debug julia-release julia-stdlib julia-deps julia-deps-libs \
julia-ui-release julia-ui-debug julia-src-release julia-src-debug \
julia-symlink julia-base julia-sysimg julia-sysimg-ji julia-sysimg-release julia-sysimg-debug \
test testall testall1 test clean distcleanall cleanall clean-* \
test testall testall1 test test-* test-revise-* \
clean distcleanall cleanall clean-* \
run-julia run-julia-debug run-julia-release run \
install binary-dist light-source-dist.tmp light-source-dist \
dist full-source-dist source-dist
Expand Down
4 changes: 3 additions & 1 deletion src/flisp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,12 @@ $(BUILDDIR)/host/Makefile:
$(BUILDDIR)/host/$(EXENAME): $(BUILDDIR)/host/Makefile
make -C $(BUILDDIR)/host $(EXENAME)

ifneq ($(BUILDDIR)$(BUILDING_HOST_TOOLS),.)
ifneq ($(BUILDDIR),.)
ifneq ($(BUILDDIR),$(SRCDIR))
$(BUILDDIR)/flisp.boot: $(SRCDIR)/flisp.boot | $(BUILDDIR)
cp $< $@
endif
endif

test:
ifneq ($(USEMSVC), 1)
Expand Down
6 changes: 3 additions & 3 deletions test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ $(TESTS):
@cd $(SRCDIR) && \
$(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no ./runtests.jl $@)

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

embedding:
@$(MAKE) -C $(SRCDIR)/$@ check $(EMBEDDING_ARGS)
Expand All @@ -39,4 +39,4 @@ clean:
@$(MAKE) -C embedding $@ $(EMBEDDING_ARGS)
@$(MAKE) -C gcext $@ $(GCEXT_ARGS)

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

0 comments on commit 810f8df

Please sign in to comment.