7142616: MAC: Honor ALT_EXPORT_PATH overrides from JDK control builds

Summary: Fix EXPORT_PATH overrides on Mac OS X and only change default.
Reviewed-by: phh, dcubed
Contributed-by: james.melvin@oracle.com

make/bsd/makefiles/defs.make

@@ -185,6 +185,9 @@ ifeq ($(OS_VENDOR), Darwin)
 
     # 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)

make/bsd/makefiles/universal.gmk

@@ -62,10 +62,14 @@ $(UNIVERSAL_LIPO_LIST):
 
 # 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 \
-	  $(MKDIR) -p $(shell dirname $@); \
-	  $(CP) $${BUILT_COPY_FILE} $@; \
+	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) $${i} $@; \
+	    fi; \
+	  done; \
 	fi