--- a/jdk/make/CompileDemos.gmk	Thu Dec 10 17:47:26 2015 -0800
+++ b/jdk/make/CompileDemos.gmk	Fri Dec 11 11:46:45 2015 +0100
@@ -459,7 +459,7 @@
   # We can only compile native code after java has been compiled (since we
   # depend on generated .h files)
   $(SUPPORT_OUTPUTDIR)/demos/native/jni/Poller/Poller.o: \
-      $(BUILD_DEMO_JAVA_Poller_COMPILE_TARGET)
+      $(BUILD_DEMO_JAVA_Poller)
 
   # Copy to image
   $(SUPPORT_OUTPUTDIR)/demos/image/jni/Poller/README.txt: \