Fix dependency ordering.
authorTaylor R Campbell <campbell@mumble.net>
Tue, 8 Jan 2019 07:37:32 +0000 (07:37 +0000)
committerTaylor R Campbell <campbell@mumble.net>
Wed, 9 Jan 2019 03:53:03 +0000 (03:53 +0000)
src/Makefile.in

index 818e61f8859c11a87891b1ea2b1991deb7a3d51a..868f735668aed6e41c1b4f166031e963cf9deecd 100644 (file)
@@ -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