Mercurial > hg > openjdk > jdk9 > hotspot
changeset 11815:0b3116993972
8069540: Remove universal binaries support from hotspot build
Reviewed-by: tbell, dholmes, dcubed
| author | erikj |
|---|---|
| date | Mon, 15 Aug 2016 16:15:16 +0200 |
| parents | 56108f8bd06d |
| children | 3fcea91bb5a8 |
| files | make/Dist.gmk |
| diffstat | 1 files changed, 0 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Dist.gmk Tue Aug 09 21:57:29 2016 +0900 +++ b/make/Dist.gmk Mon Aug 15 16:15:16 2016 +0200 @@ -46,15 +46,6 @@ endif ################################################################################ -# Functions to setup copying of files for variants - -# Support macro for SetupDistLibFile -define macosx_universalize - $(MKDIR) -p $(@D) - $(LIPO) -create -output $@ $< -endef - -################################################################################ # Setup make rules to copy a native library and associated data. # # Parameter 1 is the name of the rule. This name is used as variable prefix, @@ -74,16 +65,9 @@ $1_LIB_NAME := $(LIBRARY_PREFIX)$$($1_NAME) $1_TARGET_DIR := $$(DIST_OUTPUTDIR)/$$(LIB_SUBDIR)/$$($1_VARIANT_TARGET_DIR) - ifeq ($(OPENJDK_TARGET_OS), macosx) - # We must use the 'universalize' macro to run lipo on shared libraries, at - # least until JDK-8069540 is fixed. - $1_MACRO := macosx_universalize - endif - # Copy the the native library. $$(eval $$(call SetupCopyFiles, $1_COPY_LIB, \ DEST := $$($1_TARGET_DIR), \ - MACRO := $$($1_MACRO), \ FILES := $$(wildcard \ $$($1_SRC_DIR)/$$($1_LIB_NAME)$(SHARED_LIBRARY_SUFFIX)), \ ))