Mercurial > hg > openjdk > jdk6 > corba

changeset 52:d0decbad791f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7008723: Remove binary plugs creation and use from openjdk Reviewed-by: darcy
author ohair
date Thu, 23 Dec 2010 16:16:24 -0800
parents b7961cc671c6
children 4f0834bbc28e
files make/common/Defs.gmk make/jprt.properties
diffstat 2 files changed, 3 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/Defs.gmk	Fri Sep 24 22:45:28 2010 -0700
+++ b/make/common/Defs.gmk	Thu Dec 23 16:16:24 2010 -0800
@@ -101,17 +101,6 @@
 
 LDLIBS_COMMON += $(EXTRA_LIBS)
 
-#
-# Default is to build, not import native binaries
-#
-ifndef IMPORT_NATIVE_BINARIES
-  IMPORT_NATIVE_BINARIES=false
-endif
-# If importing libraries in, no incremental builds
-ifeq ($(IMPORT_NATIVE_BINARIES),true)
- INCREMENTAL_BUILD=false
-endif
-
 # for generated libraries
 LIBDIR              = $(OUTPUTDIR)/lib
 ABS_LIBDIR          = $(ABS_OUTPUTDIR)/lib
--- a/make/jprt.properties	Fri Sep 24 22:45:28 2010 -0700
+++ b/make/jprt.properties	Thu Dec 23 16:16:24 2010 -0800
@@ -28,9 +28,9 @@
 
 # Specific platform list
 jprt.build.platforms=\
-solaris_sparc_5.8,\
-solaris_sparcv9_5.8,\
-solaris_i586_5.8,\
+solaris_sparc_5.10,\
+solaris_sparcv9_5.10,\
+solaris_i586_5.10,\
 solaris_x64_5.10,\
 linux_i586_2.6,\
 linux_x64_2.6,\
@@ -40,14 +40,6 @@
 # The different build flavors we want
 jprt.build.flavors=product,fastdebug
 
-# Explicitly designate what the 32bit match is for the 64bit build
-jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.8
-jprt.solaris_sparcv9_5.8.build.platform.match32=solaris_sparc_5.8
-jprt.solaris_sparcv9_5.10.build.platform.match32=solaris_sparc_5.8
-jprt.solaris_x64.build.platform.match32=solaris_i586_5.8
-jprt.solaris_x64_5.8.build.platform.match32=solaris_i586_5.8
-jprt.solaris_x64_5.10.build.platform.match32=solaris_i586_5.8
-
 # Standard list of jprt test targets for this workspace
 jprt.test.targets=