Move $(COMMA) to Make.inc, add $(SPACE) as well.

JuliaLang · Mar 30, 2019 · 0ee4c99 · 0ee4c99
1 parent 2065d1d
commit 0ee4c99
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Make.inc b/Make.inc
@@ -1289,3 +1289,7 @@ endef
 # (hardened against any special characters appearing in the output)
 print-%:
 	@echo '$*=$(subst ','\'',$(subst $(newline),\n,$($*)))'
+
+# Literal values that are hard to use in Makefiles otherwise:
+COMMA:=,
+SPACE:=$(eval) $(eval)
diff --git a/sysimage.mk b/sysimage.mk
@@ -62,7 +62,6 @@ $(build_private_libdir)/corecompiler.ji: $(COMPILER_SRCS)
 		--startup-file=no -g0 -O0 compiler/compiler.jl)
 	@mv $@.tmp $@
 
-COMMA:=,
 $(build_private_libdir)/sys.ji: $(build_private_libdir)/corecompiler.ji $(JULIAHOME)/VERSION $(BASE_SRCS) $(STDLIB_SRCS)
 	@$(call PRINT_JULIA, cd $(JULIAHOME)/base && \
 	if ! $(call spawn,$(JULIA_EXECUTABLE)) -g1 -O0 -C "$(JULIA_CPU_TARGET)" --output-ji $(call cygpath_w,$@).tmp $(JULIA_SYSIMG_BUILD_FLAGS) \