From 0e6c9f3b0f4b91a2cfd5c03f365339eed9ebdf01 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Tue, 8 Jan 2019 07:37:32 +0000 Subject: [PATCH] Fix dependency ordering. --- src/Makefile.in | 50 ++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 818e61f88..868f73566 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -460,31 +460,6 @@ bundle-sos: compile-sos bundle-sos: sos/sos-unx.c +(cd sos && $(MAKE) compile-liarc-bundle) -################ -# SSP -################ - -SSP_BUILD_TARGETS = compile-ssp $(SSP_LIARC_TARGETS) -@IF_LIARC@SSP_LIARC_TARGETS = bundle-ssp -SSP_CREF_TARGETS = compile-ssp # no separate syntax step -@IF_NATIVE@SSP_DEPEND_TARGETS = compile-ssp -@IF_CROSS@SSP_DEPEND_TARGETS = stamp_cross-finished - -.PHONY: compile-ssp -compile-ssp: $(RUNTIME_CREF_TARGETS) -compile-ssp: $(XML_CREF_TARGETS) -compile-ssp: $(TOOLCHAIN) - (echo '(with-working-directory-pathname "ssp"' && \ - echo ' (lambda () (load "compile")))') \ - | $(TOOL_COMPILER) - $(CROSS_HOST) ssp - -.PHONY: bundle-ssp -bundle-ssp: $(LIARC_TOOLCHAIN) -bundle-ssp: compile-ssp -bundle-ssp: ssp/ssp-unx.c - +(cd ssp && $(MAKE) compile-liarc-bundle) - ################ # Windows FFI ################ @@ -536,6 +511,31 @@ bundle-xml: compile-xml bundle-xml: xml/xml-unx.c +(cd xml && $(MAKE) compile-liarc-bundle) +################ +# SSP +################ + +SSP_BUILD_TARGETS = compile-ssp $(SSP_LIARC_TARGETS) +@IF_LIARC@SSP_LIARC_TARGETS = bundle-ssp +SSP_CREF_TARGETS = compile-ssp # no separate syntax step +@IF_NATIVE@SSP_DEPEND_TARGETS = compile-ssp +@IF_CROSS@SSP_DEPEND_TARGETS = stamp_cross-finished + +.PHONY: compile-ssp +compile-ssp: $(RUNTIME_CREF_TARGETS) +compile-ssp: $(XML_CREF_TARGETS) +compile-ssp: $(TOOLCHAIN) + (echo '(with-working-directory-pathname "ssp"' && \ + echo ' (lambda () (load "compile")))') \ + | $(TOOL_COMPILER) + $(CROSS_HOST) ssp + +.PHONY: bundle-ssp +bundle-ssp: $(LIARC_TOOLCHAIN) +bundle-ssp: compile-ssp +bundle-ssp: ssp/ssp-unx.c + +(cd ssp && $(MAKE) compile-liarc-bundle) + ### Targets built on the target by the native compiler because we don't ### have a way to load macro definitions of an object-program into a ### cross-compiler. We should have a way to do that, and eliminate -- 2.25.1