7197849: Update new build-infra makefiles
Reviewed-by: ihse, erikj, ohrstrom, tbell
diff --git a/makefiles/GenerateClasses.gmk b/makefiles/GenerateClasses.gmk
index dda0558..4ebc56c 100644
--- a/makefiles/GenerateClasses.gmk
+++ b/makefiles/GenerateClasses.gmk
@@ -31,7 +31,7 @@
 
 # To ensure the latest stub generator files are picked up from corba repo
 # when available, we need to run with latest rmic version available. 
-ifeq ($(CROSS_COMPILE_ARCH),)
+ifneq ($(COMPILE_TYPE),cross)
     RMIC := $(UNCYGDRIVE) $(JDK_OUTPUTDIR)/bin/rmic
 endif