Mercurial > hg > graal-jvmci-8

comparison make/bsd/makefiles/defs.make @ 4865:481a9443f721

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X Summary: Add support for packaging HotSpot JVM builds in universal binaries Reviewed-by: dholmes, kamg, dcubed, phh Contributed-by: james.melvin@oracle.com
author phh
date Wed, 01 Feb 2012 15:01:08 -0500
parents e8a4934564b2
children 64b46f975ab8
comparison
equal deleted inserted replaced
4864:b2cd0ee8f778 4865:481a9443f721
1 # 1 #
2 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
169 ADD_SA_BINARIES/arm = 169 ADD_SA_BINARIES/arm =
170 ADD_SA_BINARIES/zero = 170 ADD_SA_BINARIES/zero =
171 171
172 EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH)) 172 EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
173 173
174 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX) 174 # Universal build settings
175 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX) 175 ifeq ($(OS_VENDOR), Darwin)
176 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX) 176 # Build universal binaries by default on Mac OS X
177 177 MACOSX_UNIVERSAL = true
178 UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/Xusage.txt 178 ifneq ($(ALT_MACOSX_UNIVERSAL),)
179 UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/Xusage.txt 179 MACOSX_UNIVERSAL = $(ALT_MACOSX_UNIVERSAL)
180 UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX) 180 endif
181 MAKE_ARGS += MACOSX_UNIVERSAL=$(MACOSX_UNIVERSAL)
182
183 # Universal settings
184 ifeq ($(MACOSX_UNIVERSAL), true)
185
186 # Set universal export path but avoid using ARCH or PLATFORM subdirs
187 EXPORT_PATH=$(OUTPUTDIR)/export-universal$(EXPORT_SUBDIR)
188
189 # Set universal image dir
190 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-universal$(EXPORT_SUBDIR)
191
192 # Binaries to 'universalize' if built
193 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX)
194 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX)
195 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX)
196 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX)
197
198 # Files to simply copy in place
199 UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/Xusage.txt
200 UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/Xusage.txt
201
202 endif
203 endif