--- a/ChangeLog	Tue Mar 29 00:41:46 2016 +0100
+++ b/ChangeLog	Tue Mar 29 01:12:29 2016 +0100
@@ -1,3 +1,19 @@
+2015-03-28  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2351: Split CACAO rule into configure and make stages
+	* Makefile.am:
+	(cacao): Depend on cacao-configure, cacao-build and
+	cacao-install rather than doing the job itself.
+	(cacao-configure): Split from cacao step. Configures
+	the CACAO build.
+	(cacao-build): Likewise. Builds CACAO.
+	(cacao-install): Likewise. Installs CACAO and creates
+	the CACAO symlinks needed by the OpenJDK build.
+	(clean-cacao): Delete the intermediate stamps
+	from the cacao-configure, cacao-build and cacao-install
+	steps.
+	* NEWS: Updated.
+
 2015-03-28  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR2873: Fix make distcheck

--- a/Makefile.am	Tue Mar 29 00:41:46 2016 +0100
+++ b/Makefile.am	Tue Mar 29 01:12:29 2016 +0100
@@ -2135,7 +2135,11 @@
 
 # CACAO
 
-stamps/cacao.stamp: $(OPENJDK_TREE)
+stamps/cacao.stamp: stamps/cacao-configure.stamp stamps/cacao-build.stamp stamps/cacao-install.stamp
+	mkdir -p stamps
+	touch $@
+
+stamps/cacao-configure.stamp: $(OPENJDK_TREE)
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
 	cd cacao/cacao && \
@@ -2149,7 +2153,26 @@
 	  --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
 	  --with-java-runtime-library-classes=$(RUNTIME) \
 	  --with-libatomic-ops=no \
-	  --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
+	  --enable-jre-layout $(CACAO_CONFIGURE_ARGS);
+endif
+endif
+	mkdir -p stamps
+	touch $@
+
+stamps/cacao-build.stamp: stamps/cacao-configure.stamp
+if BUILD_CACAO
+if !USE_SYSTEM_CACAO
+	cd cacao/cacao && \
+	$(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS)
+endif
+endif
+	mkdir -p stamps
+	touch $@
+
+stamps/cacao-install.stamp: stamps/cacao-build.stamp
+if BUILD_CACAO
+if !USE_SYSTEM_CACAO
+	cd cacao/cacao && \
 	$(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install
 	mkdir -p $(abs_top_builddir)/cacao/install/lib
 	touch $(abs_top_builddir)/cacao/install/lib/sa-jdi.jar
@@ -2163,6 +2186,7 @@
 
 clean-cacao:
 	rm -rf cacao
+	rm -f stamps/cacao-configure.stamp stamps/cacao-build.stamp stamps/cacao-install.stamp
 	rm -f stamps/cacao.stamp
 
 # targets for additional VMs
@@ -2842,6 +2866,12 @@
 
 cacao: stamps/cacao.stamp
 
+cacao-build: stamps/cacao-build.stamp
+
+cacao-configure: stamps/cacao-configure.stamp
+
+cacao-install: stamps/cacao-install.stamp
+
 check-crypto: stamps/check-crypto.stamp
 
 check-crypto-boot: stamps/check-crypto-boot.stamp

--- a/NEWS	Tue Mar 29 00:41:46 2016 +0100
+++ b/NEWS	Tue Mar 29 01:12:29 2016 +0100
@@ -96,6 +96,7 @@
   - PR2329: jamvm parallel unpack failures
   - PR2339: Fail early if there is no native HotSpot JIT & all other options are disabled
   - PR2348: Avoid following symlinks for CACAO and JamVM patches
+  - PR2351: Split CACAO rule into configure and make stages
   - PR2358: Add aliases for all stamp targets
   - PR2362: Update HACKING & fsg.sh.in
   - PR2363: Remove EC source code prior to build