Mercurial > hg > truffle

comparison make/bsd/makefiles/universal.gmk @ 4886:64b46f975ab8 hs23-b14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author phh
date Mon, 06 Feb 2012 14:02:51 -0500
parents 481a9443f721
children 74533f63b116
comparison
equal deleted inserted replaced
4885:585feefad374 4886:64b46f975ab8
60 fi 60 fi
61 61
62 62
63 # Copy built non-universal binaries in place 63 # Copy built non-universal binaries in place
64 $(UNIVERSAL_COPY_LIST): 64 $(UNIVERSAL_COPY_LIST):
65 BUILT_COPY_FILE="$(EXPORT_JRE_LIB_DIR)/i386/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@)"; \ 65 BUILT_COPY_FILES="`find $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) 2>/dev/null`"; \
66 if [ -f $${BUILT_COPY_FILE} ]; then \ 66 if [ -n "$${BUILT_COPY_FILES}" ]; then \
67 $(MKDIR) -p $(shell dirname $@); \ 67 for i in $${BUILT_COPY_FILES}; do \
68 $(CP) $${BUILT_COPY_FILE} $@; \ 68 if [ -f $${i} ]; then \
69 $(MKDIR) -p $(shell dirname $@); \
70 $(CP) $${i} $@; \
71 fi; \
72 done; \
69 fi 73 fi
70 74
71 75
72 # Replace arch specific binaries with universal binaries 76 # Replace arch specific binaries with universal binaries
73 export_universal: 77 export_universal: