make/bsd/makefiles/defs.make

*** 1,7 ****
  #
! # Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
--- 1,7 ----
  #
! # Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
*** 323,382 ****
    ifeq ($(STATIC_BUILD),true)
      EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.symbols
    endif
  endif
  
! # Universal build settings
  ifeq ($(OS_VENDOR), Darwin)
-   # Build universal binaries by default on Mac OS X
-   MACOSX_UNIVERSAL = true
-   ifneq ($(ALT_MACOSX_UNIVERSAL),)
-     MACOSX_UNIVERSAL = $(ALT_MACOSX_UNIVERSAL)
-   endif
-   MAKE_ARGS += MACOSX_UNIVERSAL=$(MACOSX_UNIVERSAL)
- 
-   # Universal settings
-   ifeq ($(MACOSX_UNIVERSAL), true)
  
!     # 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)
      ifneq ($(ALT_JDK_IMAGE_DIR),)
        JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
      endif
  
!     # Binaries to 'universalize' if built
!     ifneq ($(STATIC_BUILD),true)
!     UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX)
!     endif
!     UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX)
!     UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX)
! 
!     # Files to simply copy in place
!     UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/Xusage.txt
!     UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/Xusage.txt
  
      ifeq ($(STATIC_BUILD),true)
!       UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.symbols
!       UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.symbols
!       UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/minimal/libjvm.symbols
      endif
  
      ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
        ifeq ($(ZIP_DEBUGINFO_FILES),1)
!           UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.diz
!           UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.diz
!           UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/libjsig.diz
!       else
!           UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX).dSYM
!           UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX).dSYM
!           UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX).dSYM
!       endif
      endif
  
    endif
  endif
--- 323,368 ----
    ifeq ($(STATIC_BUILD),true)
      EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.symbols
    endif
  endif
  
! # Mac OS X build settings
  ifeq ($(OS_VENDOR), Darwin)
  
!         # Set export path but avoid using ARCH or PLATFORM subdirs
!         EXPORT_PATH=$(OUTPUTDIR)/export-macosx$(EXPORT_SUBDIR)
          ifneq ($(ALT_EXPORT_PATH),)
            EXPORT_PATH=$(ALT_EXPORT_PATH)
          endif
  
!         # Set image dir
!         JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-macosx$(EXPORT_SUBDIR)
          ifneq ($(ALT_JDK_IMAGE_DIR),)
            JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
          endif
  
!         # Files to copy in place
!         MACOSX_COPY_LIST += $(EXPORT_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX)
!         MACOSX_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX)
!         MACOSX_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX)
!         MACOSX_COPY_LIST += $(EXPORT_LIB_DIR)/server/Xusage.txt
!         MACOSX_COPY_LIST += $(EXPORT_LIB_DIR)/client/Xusage.txt
  
          ifeq ($(STATIC_BUILD),true)
!           MACOSX_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.symbols
!           MACOSX_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.symbols
!           MACOSX_COPY_LIST += $(EXPORT_LIB_DIR)/minimal/libjvm.symbols
          endif
  
          ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
            ifeq ($(ZIP_DEBUGINFO_FILES),1)
!               MACOSX_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.diz
!               MACOSX_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.diz
!               MACOSX_COPY_LIST += $(EXPORT_LIB_DIR)/libjsig.diz
!           else
!               MACOSX_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX).dSYM
!               MACOSX_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX).dSYM
!               MACOSX_COPY_LIST += $(EXPORT_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX).dSYM
            endif
  
    endif
  endif