--- a/components/openstack/horizon/Makefile	Wed Jul 20 17:19:20 2016 -0700
+++ b/components/openstack/horizon/Makefile	Fri Jul 22 11:42:48 2016 -0700
@@ -257,6 +257,15 @@
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
+
+# Odd django failures on S11; OpenStack is back-ported to 11.3 anyway, so no
+# need to include it in evaluation builds.
+ifeq ($(BUILD_TYPE), evaluation)
+BUILD_NO_ARCH=
+INSTALL_NO_ARCH=
+PUBLISH_STAMP=
+endif
+
 include $(WS_MAKE_RULES)/ips.mk
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
@@ -331,6 +340,7 @@
 # contained in /usr rather than having a separate spot in /var for the
 # webservd user to write compressed assets to as they get used.
 #
+ifneq ($(BUILD_TYPE), evaluation)
 .PHONY:	xstatic
 xstatic:	$(PROTO_DIR) build
 	for xs_archive in $$(ls -d XStatic-* | grep -v .tar.gz); do \
@@ -345,12 +355,15 @@
 		    --root $(PROTO_DIR); \
 		cd ../; \
 	done
+endif
 
 # common targets
 build:		$(BUILD_NO_ARCH)
 
+ifneq ($(BUILD_TYPE), evaluation)
 # make sure all of the xstatic modules are built
 install:	$(INSTALL_NO_ARCH) xstatic
+endif
 
 test:		$(NO_TESTS)