changeset 6225:b54a5b7d2e65

8004491: Build breakage on Linux due to 8004188 Reviewed-by: chegar, erikj
author alanb
date Wed, 05 Dec 2012 12:20:00 +0000
parents 44ae777564eb
children a971516029ab e4d88a7352c6
files makefiles/CopyFiles.gmk
diffstat 1 files changed, 1 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/makefiles/CopyFiles.gmk	Tue Dec 04 17:40:41 2012 -0500
+++ b/makefiles/CopyFiles.gmk	Wed Dec 05 12:20:00 2012 +0000
@@ -356,21 +356,9 @@
 
 ##########################################################################################
 
-PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security
+PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-$(OPENJDK_TARGET_OS)
 PROPS_DST := $(JDK_OUTPUTDIR)/lib/security/java.security
 
-ifeq ($(OPENJDK_TARGET_OS), solaris)
-	PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-solaris
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
-	PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-windows
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
-	PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-macosx
-endif
-
 $(PROPS_DST): $(PROPS_SRC)
 	$(MKDIR) -p $(@D)
 	$(RM) $@