1.1 --- a/make/bsd/makefiles/defs.make Mon Jan 30 23:27:30 2012 -0500
1.2 +++ b/make/bsd/makefiles/defs.make Wed Feb 01 15:01:08 2012 -0500
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -171,10 +171,33 @@
1.11
1.12 EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
1.13
1.14 -UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX)
1.15 -UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX)
1.16 -UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX)
1.17 +# Universal build settings
1.18 +ifeq ($(OS_VENDOR), Darwin)
1.19 + # Build universal binaries by default on Mac OS X
1.20 + MACOSX_UNIVERSAL = true
1.21 + ifneq ($(ALT_MACOSX_UNIVERSAL),)
1.22 + MACOSX_UNIVERSAL = $(ALT_MACOSX_UNIVERSAL)
1.23 + endif
1.24 + MAKE_ARGS += MACOSX_UNIVERSAL=$(MACOSX_UNIVERSAL)
1.25
1.26 -UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/Xusage.txt
1.27 -UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/Xusage.txt
1.28 -UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX)
1.29 + # Universal settings
1.30 + ifeq ($(MACOSX_UNIVERSAL), true)
1.31 +
1.32 + # Set universal export path but avoid using ARCH or PLATFORM subdirs
1.33 + EXPORT_PATH=$(OUTPUTDIR)/export-universal$(EXPORT_SUBDIR)
1.34 +
1.35 + # Set universal image dir
1.36 + JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-universal$(EXPORT_SUBDIR)
1.37 +
1.38 + # Binaries to 'universalize' if built
1.39 + UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX)
1.40 + UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX)
1.41 + UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX)
1.42 + UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX)
1.43 +
1.44 + # Files to simply copy in place
1.45 + UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/Xusage.txt
1.46 + UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/Xusage.txt
1.47 +
1.48 + endif
1.49 +endif
