Merge

8bfae86c · ohair · f4849a9a · 83619b69 · 8bfae86c
隐藏空白更改
内联并排

Showing with 12 addition and 7 deletion

make/sun/rmi/rmi/Makefile make/sun/rmi/rmi/Makefile +12 -7

未找到文件。
--- a/make/sun/rmi/rmi/Makefile
+++ b/make/sun/rmi/rmi/Makefile
@@ -85,16 +85,21 @@ REMOTE_impls = \
 	sun.rmi.registry.RegistryImpl \
 	sun.rmi.transport.DGCImpl
-ifeq ($(PLATFORM), windows)
+#
-build: stubs
+# The java-rmi.cgi script in bin/ only gets delivered in certain situations
-else # PLATFORM
+#
-ifneq ($(ARCH_DATA_MODEL), 32)
+BUILD_TARGETS = stubs
-build: stubs
+ifeq ($(PLATFORM), linux)
-else # ARCH_DATA_MODEL
+  BUILD_TARGETS += bin
-build: stubs bin
 endif
+ifeq ($(PLATFORM), solaris)
+  ifeq ($(ARCH_DATA_MODEL), 32)
+    BUILD_TARGETS += bin
+  endif
 endif
+build: $(BUILD_TARGETS)
 clean clobber:: bin.clean