--- a/make-rules/ips.mk Mon Feb 07 17:45:11 2011 -0800
+++ b/make-rules/ips.mk Tue Feb 08 10:54:06 2011 -0800
@@ -47,7 +47,6 @@
# order is important
GENERATE_TRANSFORMS += $(WS_TOP)/transforms/generate-cleanup
-GENERATE_TRANSFORMS += $(WS_TOP)/transforms/variant.arch
COMPARISON_TRANSFORMS += $(WS_TOP)/transforms/comparison-cleanup
COMPARISON_TRANSFORMS += $(PKGMOGRIFY_TRANSFORMS)
@@ -116,8 +115,7 @@
$(PUBLISH_TRANSFORMS) | \
sed -e '/^$$/d' -e '/^#.*$$/d' | uniq >$@
-# generate dependencies, drop variant.arch in set and depend actions because
-# "pkgdepend resolve" fails when it's present.
+# generate dependencies
$(MANIFEST_BASE)-%.depend: $(MANIFEST_BASE)-%.mogrified
$(PKGDEPEND) generate -m $< $(PROTO_DIR) >$@