United StatesChange Country, Oracle Worldwide Web Sites Communities I am a... I want to...
Bug ID: JDK-7142616 MAC: Honor ALT_EXPORT_PATH overrides from JDK control builds
JDK-7142616 : MAC: Honor ALT_EXPORT_PATH overrides from JDK control builds

Details
Type:
Bug
Submit Date:
2012-02-03
Status:
Closed
Updated Date:
2012-04-04
Project Name:
JDK
Resolved Date:
2012-04-04
Component:
hotspot
OS:
os_x
Sub-Component:
build
CPU:
generic
Priority:
P2
Resolution:
Fixed
Affected Versions:
hs23
Fixed Versions:
hs23 (b14)

Related Reports
Backport:
Backport:

Sub Tasks

Description
JDK control builds override the default HotSpot EXPORT_PATH.  The Mac OS X build does not properly honor that override.  Both the hotspot and jdk repos can be built separately without issue.  However, when built together, as in control and RE builds, the jdk cannot locate the hotspot built libraries.

                                    

Comments
EVALUATION

http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/64b46f975ab8
                                     
2012-02-06
SUGGESTED FIX

diff --git a/make/bsd/makefiles/defs.make b/make/bsd/makefiles/defs.make
--- a/make/bsd/makefiles/defs.make
+++ b/make/bsd/makefiles/defs.make
@@ -185,6 +185,9 @@
 
     # Set universal export path but avoid using ARCH or PLATFORM subdirs
     EXPORT_PATH=$(OUTPUTDIR)/export-universal$(EXPORT_SUBDIR)
+    ifneq ($(ALT_EXPORT_PATH),)
+      EXPORT_PATH=$(ALT_EXPORT_PATH)
+    endif
 
     # Set universal image dir
     JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-universal$(EXPORT_SUBDIR)
diff --git a/make/bsd/makefiles/universal.gmk b/make/bsd/makefiles/universal.gmk
--- a/make/bsd/makefiles/universal.gmk
+++ b/make/bsd/makefiles/universal.gmk
@@ -62,10 +62,14 @@
 
 # Copy built non-universal binaries in place
 $(UNIVERSAL_COPY_LIST):
-	BUILT_COPY_FILE="$(EXPORT_JRE_LIB_DIR)/i386/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@)"; \
-	if [ -f $${BUILT_COPY_FILE} ]; then \
+	BUILT_COPY_FILES="`find $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) 2>/dev/null`"; \
+	if [ -n "$${BUILT_COPY_FILES}" ]; then \
+	  for i in $${BUILT_COPY_FILES}; do \
+	    if [ -f $${i} ]; then \
 	  $(MKDIR) -p $(shell dirname $@); \
-	  $(CP) $${BUILT_COPY_FILE} $@; \
+	      $(CP) $${i} $@; \
+	    fi; \
+	  done; \
 	fi
                                     
2012-02-06
EVALUATION

http://hg.openjdk.java.net/lambda/lambda/hotspot/rev/64b46f975ab8
                                     
2012-03-22



Hardware and Software, Engineered to Work Together