hotspot/make/bsd/makefiles/defs.make
author bobv
Mon, 19 Oct 2015 13:21:37 -0400
changeset 33583 af842015bfaa
parent 30113 3f6beb804b02
child 34289 2d1821a50263
child 33980 cbd63978deb5
permissions -rw-r--r--
8136556: Add the ability to perform static builds of MacOSX x64 binaries Reviewed-by: ihse, bdelsart, gadams, lfoltan, rriggs, hseigel, twisti
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
     1
#
33583
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
     2
# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
     4
#
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
     7
# published by the Free Software Foundation.
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
     8
#
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
     9
# This code is distributed in the hope that it will be useful, but WITHOUT
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    10
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    11
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    12
# version 2 for more details (a copy is included in the LICENSE file that
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    13
# accompanied this code).
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    14
#
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    15
# You should have received a copy of the GNU General Public License version
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    16
# 2 along with this work; if not, write to the Free Software Foundation,
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    17
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    18
#
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    19
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    20
# or visit www.oracle.com if you need additional information or have any
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    21
# questions.
17006
b9bfa72b7dda 7104565: trim jprt build targets
drchase
parents: 15793
diff changeset
    22
#
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    23
#
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    24
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    25
# The common definitions for hotspot bsd builds.
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    26
# Include the top level defs.make under make directory instead of this one.
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    27
# This file is included into make/defs.make.
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    28
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    29
SLASH_JAVA ?= /java
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    30
26691
40ea2c41f53b 8056999: Make hotspot builds less verbose on default log level
ihse
parents: 20686
diff changeset
    31
define print_info
40ea2c41f53b 8056999: Make hotspot builds less verbose on default log level
ihse
parents: 20686
diff changeset
    32
  ifneq ($$(LOG_LEVEL), warn)
40ea2c41f53b 8056999: Make hotspot builds less verbose on default log level
ihse
parents: 20686
diff changeset
    33
    $$(shell echo >&2 "INFO: $1")
40ea2c41f53b 8056999: Make hotspot builds less verbose on default log level
ihse
parents: 20686
diff changeset
    34
  endif
40ea2c41f53b 8056999: Make hotspot builds less verbose on default log level
ihse
parents: 20686
diff changeset
    35
endef
40ea2c41f53b 8056999: Make hotspot builds less verbose on default log level
ihse
parents: 20686
diff changeset
    36
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    37
# Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    38
ARCH:=$(shell uname -m)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    39
PATH_SEP = :
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    40
ifeq ($(LP64), 1)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    41
  ARCH_DATA_MODEL ?= 64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    42
else
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    43
  ARCH_DATA_MODEL ?= 32
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    44
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    45
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    46
# zero
12156
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
    47
ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    48
  ifeq ($(ARCH_DATA_MODEL), 64)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    49
    MAKE_ARGS      += LP64=1
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    50
  endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    51
  PLATFORM         = bsd-zero
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    52
  VM_PLATFORM      = bsd_$(subst i386,i486,$(ZERO_LIBARCH))
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    53
  HS_ARCH          = zero
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    54
  ARCH             = zero
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    55
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    56
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    57
# ia64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    58
ifeq ($(ARCH), ia64)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    59
  ARCH_DATA_MODEL = 64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    60
  MAKE_ARGS      += LP64=1
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    61
  PLATFORM        = bsd-ia64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    62
  VM_PLATFORM     = bsd_ia64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    63
  HS_ARCH         = ia64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    64
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    65
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    66
# sparc
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    67
ifeq ($(ARCH), sparc64)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    68
  ifeq ($(ARCH_DATA_MODEL), 64)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    69
    ARCH_DATA_MODEL  = 64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    70
    MAKE_ARGS        += LP64=1
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    71
    PLATFORM         = bsd-sparcv9
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    72
    VM_PLATFORM      = bsd_sparcv9
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    73
  else
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    74
    ARCH_DATA_MODEL  = 32
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    75
    PLATFORM         = bsd-sparc
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    76
    VM_PLATFORM      = bsd_sparc
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    77
  endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    78
  HS_ARCH            = sparc
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    79
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    80
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    81
# amd64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    82
ifneq (,$(findstring $(ARCH), amd64 x86_64))
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    83
  ifeq ($(ARCH_DATA_MODEL), 64)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    84
    ARCH_DATA_MODEL = 64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    85
    MAKE_ARGS       += LP64=1
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    86
    PLATFORM        = bsd-amd64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    87
    VM_PLATFORM     = bsd_amd64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    88
    HS_ARCH         = x86
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    89
  else
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    90
    ARCH_DATA_MODEL = 32
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    91
    PLATFORM        = bsd-i586
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    92
    VM_PLATFORM     = bsd_i486
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    93
    HS_ARCH         = x86
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    94
    # We have to reset ARCH to i386 since SRCARCH relies on it
17006
b9bfa72b7dda 7104565: trim jprt build targets
drchase
parents: 15793
diff changeset
    95
    ARCH            = i386
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    96
  endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    97
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    98
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    99
# i386
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   100
ifeq ($(ARCH), i386)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   101
  ifeq ($(ARCH_DATA_MODEL), 64)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   102
    ARCH_DATA_MODEL = 64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   103
    MAKE_ARGS       += LP64=1
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   104
    PLATFORM        = bsd-amd64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   105
    VM_PLATFORM     = bsd_amd64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   106
    HS_ARCH         = x86
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   107
    # We have to reset ARCH to amd64 since SRCARCH relies on it
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   108
    ARCH            = amd64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   109
  else
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   110
    ARCH_DATA_MODEL  = 32
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   111
    PLATFORM         = bsd-i586
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   112
    VM_PLATFORM      = bsd_i486
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   113
    HS_ARCH          = x86
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   114
  endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   115
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   116
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   117
# ARM
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   118
ifeq ($(ARCH), arm)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   119
  ARCH_DATA_MODEL  = 32
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   120
  PLATFORM         = bsd-arm
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   121
  VM_PLATFORM      = bsd_arm
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   122
  HS_ARCH          = arm
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   123
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   124
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   125
# PPC
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   126
ifeq ($(ARCH), ppc)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   127
  ARCH_DATA_MODEL  = 32
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   128
  PLATFORM         = bsd-ppc
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   129
  VM_PLATFORM      = bsd_ppc
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   130
  HS_ARCH          = ppc
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   131
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   132
12156
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   133
# On 32 bit bsd we build server and client, on 64 bit just server.
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   134
ifeq ($(JVM_VARIANTS),)
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   135
  ifeq ($(ARCH_DATA_MODEL), 32)
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   136
    JVM_VARIANTS:=client,server
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   137
    JVM_VARIANT_CLIENT:=true
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   138
    JVM_VARIANT_SERVER:=true
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   139
  else
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   140
    JVM_VARIANTS:=server
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   141
    JVM_VARIANT_SERVER:=true
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   142
  endif
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   143
endif
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   144
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   145
OS_VENDOR:=$(shell uname -s)
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   146
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   147
# determine if HotSpot is being built in JDK6 or earlier version
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   148
JDK6_OR_EARLIER=0
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   149
ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1"
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   150
  # if the longer variable names (newer build style) are set, then check those
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   151
  ifeq "$(shell expr \( $(JDK_MAJOR_VERSION) = 1 \& $(JDK_MINOR_VERSION) \< 7 \))" "1"
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   152
    JDK6_OR_EARLIER=1
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   153
  endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   154
else
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   155
  # the longer variables aren't set so check the shorter variable names
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   156
  ifeq "$(shell expr \( '$(JDK_MAJOR_VER)' = 1 \& '$(JDK_MINOR_VER)' \< 7 \))" "1"
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   157
    JDK6_OR_EARLIER=1
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   158
  endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   159
endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   160
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   161
ifeq ($(JDK6_OR_EARLIER),0)
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   162
  # Full Debug Symbols is supported on JDK7 or newer.
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   163
  # The Full Debug Symbols (FDS) default for BUILD_FLAVOR == product
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   164
  # builds is enabled with debug info files ZIP'ed to save space. For
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   165
  # BUILD_FLAVOR != product builds, FDS is always enabled, after all a
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   166
  # debug build without debug info isn't very useful.
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   167
  # The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled.
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   168
  #
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   169
  # If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   170
  # disabled for a BUILD_FLAVOR == product build.
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   171
  #
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   172
  # Note: Use of a different variable name for the FDS override option
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   173
  # versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   174
  # versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   175
  # in options via environment variables, use of distinct variables
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   176
  # prevents strange behaviours. For example, in a BUILD_FLAVOR !=
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   177
  # product build, the FULL_DEBUG_SYMBOLS environment variable will be
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   178
  # 0, but the ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   179
  # the same variable name is used, then different values can be picked
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   180
  # up by different parts of the build. Just to be clear, we only need
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   181
  # two variable names because the incoming option value can be
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   182
  # overridden in some situations, e.g., a BUILD_FLAVOR != product
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   183
  # build.
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   184
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   185
  # Due to the multiple sub-make processes that occur this logic gets
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   186
  # executed multiple times. We reduce the noise by at least checking that
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   187
  # BUILD_FLAVOR has been set.
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   188
  ifneq ($(BUILD_FLAVOR),)
33583
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   189
    # FULL_DEBUG_SYMBOLS not created for individual static libraries
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   190
    ifeq ($(STATIC_BUILD),false)
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   191
      ifeq ($(BUILD_FLAVOR), product)
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   192
        FULL_DEBUG_SYMBOLS ?= 1
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   193
        ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   194
      else
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   195
        # debug variants always get Full Debug Symbols (if available)
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   196
        ENABLE_FULL_DEBUG_SYMBOLS = 1
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   197
      endif
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   198
     endif
26691
40ea2c41f53b 8056999: Make hotspot builds less verbose on default log level
ihse
parents: 20686
diff changeset
   199
    $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)"))
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   200
    # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   201
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   202
    ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   203
      ifeq ($(OS_VENDOR), Darwin)
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   204
          # MacOS X doesn't use OBJCOPY or STRIP_POLICY
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   205
          OBJCOPY=
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   206
          STRIP_POLICY=
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   207
          ZIP_DEBUGINFO_FILES ?= 1
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   208
      else
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   209
        # Default OBJCOPY comes from GNU Binutils on BSD
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   210
        ifeq ($(CROSS_COMPILE_ARCH),)
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   211
          DEF_OBJCOPY=/usr/bin/objcopy
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   212
        else
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   213
          # Assume objcopy is part of the cross-compilation toolset
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   214
          ifneq ($(ALT_COMPILER_PATH),)
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   215
            DEF_OBJCOPY=$(ALT_COMPILER_PATH)/objcopy
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   216
          endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   217
        endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   218
        OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   219
        ifneq ($(ALT_OBJCOPY),)
26691
40ea2c41f53b 8056999: Make hotspot builds less verbose on default log level
ihse
parents: 20686
diff changeset
   220
          $(eval $(call print_info, "ALT_OBJCOPY=$(ALT_OBJCOPY)"))
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   221
          OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   222
        endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   223
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   224
        ifeq ($(OBJCOPY),)
26691
40ea2c41f53b 8056999: Make hotspot builds less verbose on default log level
ihse
parents: 20686
diff changeset
   225
          $(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo" \
40ea2c41f53b 8056999: Make hotspot builds less verbose on default log level
ihse
parents: 20686
diff changeset
   226
              "files. You may need to set ALT_OBJCOPY."))
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   227
          ENABLE_FULL_DEBUG_SYMBOLS=0
26691
40ea2c41f53b 8056999: Make hotspot builds less verbose on default log level
ihse
parents: 20686
diff changeset
   228
          $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)"))
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   229
        else
26691
40ea2c41f53b 8056999: Make hotspot builds less verbose on default log level
ihse
parents: 20686
diff changeset
   230
          $(eval $(call print_info, "$(OBJCOPY) cmd found so will create .debuginfo" \
40ea2c41f53b 8056999: Make hotspot builds less verbose on default log level
ihse
parents: 20686
diff changeset
   231
              "files."))
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   232
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   233
          # Library stripping policies for .debuginfo configs:
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   234
          #   all_strip - strips everything from the library
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   235
          #   min_strip - strips most stuff from the library; leaves
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   236
          #               minimum symbols
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   237
          #   no_strip  - does not strip the library at all
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   238
          #
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   239
          # Oracle security policy requires "all_strip". A waiver was
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   240
          # granted on 2011.09.01 that permits using "min_strip" in the
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   241
          # Java JDK and Java JRE.
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   242
          #
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   243
          # Currently, STRIP_POLICY is only used when Full Debug Symbols
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   244
          # is enabled.
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   245
          #
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   246
          STRIP_POLICY ?= min_strip
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   247
26691
40ea2c41f53b 8056999: Make hotspot builds less verbose on default log level
ihse
parents: 20686
diff changeset
   248
          $(eval $(call print_info, "STRIP_POLICY=$(STRIP_POLICY)"))
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   249
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   250
          ZIP_DEBUGINFO_FILES ?= 1
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   251
        endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   252
26691
40ea2c41f53b 8056999: Make hotspot builds less verbose on default log level
ihse
parents: 20686
diff changeset
   253
        $(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)"))
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   254
      endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   255
    endif # ENABLE_FULL_DEBUG_SYMBOLS=1
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   256
  endif # BUILD_FLAVOR
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   257
endif # JDK_6_OR_EARLIER
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   258
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   259
JDK_INCLUDE_SUBDIR=bsd
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   260
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   261
# Library suffix
33583
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   262
ifneq ($(STATIC_BUILD),true)
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   263
  ifeq ($(OS_VENDOR),Darwin)
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   264
    LIBRARY_SUFFIX=dylib
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   265
  else
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   266
    LIBRARY_SUFFIX=so
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   267
  endif
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   268
else
33583
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   269
  LIBRARY_SUFFIX=a
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   270
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   271
33583
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   272
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   273
EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   274
33583
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   275
# jsig library not needed for static builds
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   276
ifneq ($(STATIC_BUILD),true)
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   277
# client and server subdirectories have symbolic links to ../libjsig.so
33583
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   278
  EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   279
endif
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   280
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   281
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   282
  ifeq ($(ZIP_DEBUGINFO_FILES),1)
30113
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   283
      EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.diz
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   284
  else
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   285
    ifeq ($(OS_VENDOR), Darwin)
30113
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   286
        EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX).dSYM
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   287
    else
30113
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   288
        EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.debuginfo
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   289
    endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   290
  endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   291
endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   292
30113
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   293
EXPORT_SERVER_DIR = $(EXPORT_LIB_ARCH_DIR)/server
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   294
EXPORT_CLIENT_DIR = $(EXPORT_LIB_ARCH_DIR)/client
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   295
EXPORT_MINIMAL_DIR = $(EXPORT_LIB_ARCH_DIR)/minimal
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   296
12156
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   297
ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   298
  EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   299
  EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
33583
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   300
  ifeq ($(STATIC_BUILD),true)
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   301
    EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.symbols
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   302
  endif
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   303
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   304
  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   305
    ifeq ($(ZIP_DEBUGINFO_FILES),1)
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   306
        EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   307
    else
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   308
      ifeq ($(OS_VENDOR), Darwin)
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   309
          EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX).dSYM
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   310
      else
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   311
          EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   312
      endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   313
    endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   314
  endif
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   315
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   316
12156
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   317
ifeq ($(JVM_VARIANT_CLIENT),true)
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   318
  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   319
  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
33583
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   320
  ifeq ($(STATIC_BUILD),true)
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   321
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.symbols
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   322
  endif
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   323
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   324
  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   325
    ifeq ($(ZIP_DEBUGINFO_FILES),1)
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   326
        EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   327
    else
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   328
      ifeq ($(OS_VENDOR), Darwin)
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   329
          EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX).dSYM
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   330
      else
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   331
          EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   332
      endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   333
    endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   334
  endif
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   335
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   336
13975
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   337
ifeq ($(JVM_VARIANT_MINIMAL1),true)
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   338
  EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/Xusage.txt
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   339
  EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.$(LIBRARY_SUFFIX)
33583
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   340
  ifeq ($(STATIC_BUILD),true)
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   341
    EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.symbols
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   342
  endif
13975
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   343
endif
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   344
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   345
# Serviceability Binaries
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   346
# No SA Support for PPC, IA64, ARM or zero
30113
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   347
ADD_SA_BINARIES/x86   = $(EXPORT_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   348
                        $(EXPORT_LIB_DIR)/sa-jdi.jar
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   349
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   350
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   351
  ifeq ($(ZIP_DEBUGINFO_FILES),1)
30113
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   352
      ADD_SA_BINARIES/x86 += $(EXPORT_LIB_ARCH_DIR)/libsaproc.diz
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   353
  else
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   354
    ifeq ($(OS_VENDOR), Darwin)
30113
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   355
        ADD_SA_BINARIES/x86 += $(EXPORT_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX).dSYM
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   356
    else
30113
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   357
        ADD_SA_BINARIES/x86 += $(EXPORT_LIB_ARCH_DIR)/libsaproc.debuginfo
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   358
    endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   359
  endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   360
endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   361
30113
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   362
ADD_SA_BINARIES/sparc = $(EXPORT_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   363
                        $(EXPORT_LIB_DIR)/sa-jdi.jar
30113
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   364
ADD_SA_BINARIES/universal = $(EXPORT_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
10739
91935236600e 7098194: integrate macosx-port changes
dcubed
parents: 10565
diff changeset
   365
                            $(EXPORT_LIB_DIR)/sa-jdi.jar
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   366
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   367
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   368
  ifeq ($(ZIP_DEBUGINFO_FILES),1)
30113
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   369
      ADD_SA_BINARIES/universal += $(EXPORT_LIB_ARCH_DIR)/libsaproc.diz
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   370
  else
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   371
    ifeq ($(OS_VENDOR), Darwin)
30113
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   372
        ADD_SA_BINARIES/universal += $(EXPORT_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX).dSYM
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   373
    else
30113
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   374
        ADD_SA_BINARIES/universal += $(EXPORT_LIB_ARCH_DIR)/libsaproc.debuginfo
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   375
    endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   376
  endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   377
endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   378
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   379
ADD_SA_BINARIES/ppc   =
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   380
ADD_SA_BINARIES/ia64  =
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   381
ADD_SA_BINARIES/arm   =
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   382
ADD_SA_BINARIES/zero  =
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   383
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   384
EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
10739
91935236600e 7098194: integrate macosx-port changes
dcubed
parents: 10565
diff changeset
   385
11629
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   386
# Universal build settings
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   387
ifeq ($(OS_VENDOR), Darwin)
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   388
  # Build universal binaries by default on Mac OS X
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   389
  MACOSX_UNIVERSAL = true
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   390
  ifneq ($(ALT_MACOSX_UNIVERSAL),)
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   391
    MACOSX_UNIVERSAL = $(ALT_MACOSX_UNIVERSAL)
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   392
  endif
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   393
  MAKE_ARGS += MACOSX_UNIVERSAL=$(MACOSX_UNIVERSAL)
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   394
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   395
  # Universal settings
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   396
  ifeq ($(MACOSX_UNIVERSAL), true)
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   397
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   398
    # Set universal export path but avoid using ARCH or PLATFORM subdirs
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   399
    EXPORT_PATH=$(OUTPUTDIR)/export-universal$(EXPORT_SUBDIR)
11649
04e30cc559a9 7142616: MAC: Honor ALT_EXPORT_PATH overrides from JDK control builds
phh
parents: 11629
diff changeset
   400
    ifneq ($(ALT_EXPORT_PATH),)
04e30cc559a9 7142616: MAC: Honor ALT_EXPORT_PATH overrides from JDK control builds
phh
parents: 11629
diff changeset
   401
      EXPORT_PATH=$(ALT_EXPORT_PATH)
04e30cc559a9 7142616: MAC: Honor ALT_EXPORT_PATH overrides from JDK control builds
phh
parents: 11629
diff changeset
   402
    endif
10739
91935236600e 7098194: integrate macosx-port changes
dcubed
parents: 10565
diff changeset
   403
11629
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   404
    # Set universal image dir
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   405
    JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-universal$(EXPORT_SUBDIR)
11784
715f58266a42 7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk
twisti
parents: 11649
diff changeset
   406
    ifneq ($(ALT_JDK_IMAGE_DIR),)
715f58266a42 7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk
twisti
parents: 11649
diff changeset
   407
      JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
715f58266a42 7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk
twisti
parents: 11649
diff changeset
   408
    endif
11629
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   409
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   410
    # Binaries to 'universalize' if built
33583
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   411
    ifneq ($(STATIC_BUILD),true)
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   412
      UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX)
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   413
    endif
30113
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   414
    UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX)
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   415
    UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX)
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   416
    UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX)
11629
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   417
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   418
    # Files to simply copy in place
30113
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   419
    UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/Xusage.txt
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   420
    UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/Xusage.txt
33583
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   421
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   422
    ifeq ($(STATIC_BUILD),true)
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   423
      UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.symbols
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   424
      UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.symbols
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   425
      UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/minimal/libjvm.symbols
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   426
    endif
af842015bfaa 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 30113
diff changeset
   427
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   428
    ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   429
      ifeq ($(ZIP_DEBUGINFO_FILES),1)
30113
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   430
          UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.diz
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   431
          UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.diz
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   432
          UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/libjsig.diz
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   433
          UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/libsaproc.diz
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   434
      else
30113
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   435
          UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX).dSYM
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   436
          UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX).dSYM
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   437
          UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX).dSYM
3f6beb804b02 8075725: Remove /jre subdir in hotspot dist dir
erikj
parents: 26691
diff changeset
   438
          UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX).dSYM
20686
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   439
      endif
1fa9a75192c3 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17006
diff changeset
   440
    endif
11629
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   441
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   442
  endif
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   443
endif