diff options
| author | phh <none@none> | 2012-02-06 14:02:51 -0500 |
|---|---|---|
| committer | phh <none@none> | 2012-02-06 14:02:51 -0500 |
| commit | b3939d5f1cc60d48b004cb8d122b5f8745927486 (patch) | |
| tree | 6a96a2142dd2efff1c3e59d820d765478dd06038 | |
| parent | d8ce11fc30fe01ff1203e02f5c75f68c02fb8b24 (diff) | |
7142616: MAC: Honor ALT_EXPORT_PATH overrides from JDK control buildshs23-b14
Summary: Fix EXPORT_PATH overrides on Mac OS X and only change default.
Reviewed-by: phh, dcubed
Contributed-by: james.melvin@oracle.com
| -rw-r--r-- | make/bsd/makefiles/defs.make | 3 | ||||
| -rw-r--r-- | make/bsd/makefiles/universal.gmk | 12 |
2 files changed, 11 insertions, 4 deletions
diff --git a/make/bsd/makefiles/defs.make b/make/bsd/makefiles/defs.make index 098664a8f..f442a0596 100644 --- a/make/bsd/makefiles/defs.make +++ b/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) diff --git a/make/bsd/makefiles/universal.gmk b/make/bsd/makefiles/universal.gmk index 0b14e37b1..169b70d87 100644 --- a/make/bsd/makefiles/universal.gmk +++ b/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 |