--- a/make/CompileDemos.gmk	Tue Feb 12 11:58:41 2019 -0500
+++ b/make/CompileDemos.gmk	Wed Feb 13 13:22:15 2019 -0500
@@ -239,7 +239,7 @@
 	$(call install-file)
 	$(CHMOD) -f ug+w $@
 
-ifeq ($(OPENJDK_TARGET_OS), solaris)
+ifeq ($(call isTargetOs, solaris), true)
   TARGETS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \
     $(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%, \
     $(call CacheFind, $(DEMO_SHARE_SRC)/nbproject))