jdk/make/Import.gmk
author mikael
Tue, 18 Feb 2014 17:55:04 -0800
changeset 23304 bb48872f9326
parent 21805 c7d7946239de
child 23355 87227bf950ef
permissions -rw-r--r--
8035287: gcc warnings compiling various libraries files Reviewed-by: prr
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
     1
#
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
     2
# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
     4
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    10
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    15
# accompanied this code).
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    16
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    20
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    23
# questions.
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    24
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    25
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    26
default: all
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    27
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    28
include $(SPEC)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    29
include MakeBase.gmk
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    30
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    31
#######
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    32
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    33
IMPORT_TARGET_FILES :=
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    34
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    35
IMPORT_CLASSES := CORBA JAXP JAXWS LANGTOOLS
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    36
IMPORT_SOURCES := CORBA JAXP JAXWS LANGTOOLS
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    37
# Only Corba has binaries
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    38
IMPORT_BINARIES := CORBA
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    39
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    40
#######
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    41
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    42
# Put the libraries here. Different locations for different target apis.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    43
ifeq ($(OPENJDK_TARGET_OS_API), posix)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    44
  INSTALL_LIBRARIES_HERE := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    45
  HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    46
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    47
  INSTALL_LIBRARIES_HERE := $(JDK_OUTPUTDIR)/bin
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    48
  HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/jre/bin
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    49
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    50
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    51
#######
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    52
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    53
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    54
# jar xf/unzip fails when executing them all in parallel
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    55
# introduce artificial dependency (_DEP) buuhhh
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    56
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    57
define ImportClasses
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    58
  $1_CLASSES_DEP := $$(IMPORT_TARGET_CLASSES)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    59
  IMPORT_TARGET_CLASSES += $(JDK_OUTPUTDIR)/classes/_the.$1.classes.imported
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    60
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    61
  $(JDK_OUTPUTDIR)/classes/_the.$1.classes.imported: $$($1_DIST)/lib/classes.jar $$($1_CLASSES_DEP)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    62
	$(ECHO) Importing $1 classes.jar
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    63
	$(MKDIR) -p $$(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    64
	$(RM) $$@ $$@.tmp
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    65
	($(CD) $$(@D) && $(JAR) xvf $$< > $$@.tmp)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    66
	$(MV) $$@.tmp $$@
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    67
endef
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    68
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    69
define ImportSources
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    70
  $1_SOURCES_DEP := $$(IMPORT_TARGET_SOURCES)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    71
  IMPORT_TARGET_SOURCES += $(JDK_OUTPUTDIR)/impsrc/_the.$1.src.imported
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    72
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    73
  $(JDK_OUTPUTDIR)/impsrc/_the.$1.src.imported: $$($1_DIST)/lib/src.zip $$($1_SOURCES_DEP)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    74
	$(ECHO) Importing $1 src.zip
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    75
	$(MKDIR) -p $$(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    76
	$(RM) $$@ $$@.tmp
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    77
	($(CD) $$(@D) && $(JAR) xvf $$< > $$@.tmp)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    78
	$(MV) $$@.tmp $$@
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    79
endef
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    80
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    81
define ImportBinaries
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    82
  $1_BINARIES_DEP := $$(IMPORT_TARGET_BINARIES)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    83
  IMPORT_TARGET_BINARIES += $(JDK_OUTPUTDIR)/_the.$1.binaries.imported
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    84
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    85
  $(JDK_OUTPUTDIR)/_the.$1.binaries.imported: $$($1_DIST)/lib/bin.zip $$($1_BINARIES_DEP)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    86
	$(ECHO) Importing $1 bin.zip
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    87
	$(MKDIR) -p $$(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    88
	$(RM) $$@ $$@.tmp
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    89
	($(CD) $$(@D) && $(JAR) xvf $$< > $$@.tmp)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    90
	$(MV) $$@.tmp $$@
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    91
endef
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    92
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    93
#######
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    94
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    95
$(foreach I, $(IMPORT_CLASSES), $(eval $(call ImportClasses,$I)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    96
$(foreach I, $(IMPORT_SOURCES), $(eval $(call ImportSources,$I)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
    97
$(foreach I, $(IMPORT_BINARIES), $(eval $(call ImportBinaries,$I)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    98
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
    99
IMPORT_TARGET_FILES += $(IMPORT_TARGET_CLASSES) $(IMPORT_TARGET_SOURCES) $(IMPORT_TARGET_BINARIES)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   100
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   101
#######
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   102
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   103
define CopyDir
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   104
  $1_SRC_FILES := $(shell $(FIND) $2 -type f -a \( -name DUMMY $(addprefix -o$(SPACE)-name$(SPACE),$4) \))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   105
  $1_DST_FILES := $$(patsubst $2/%,$3/%,$$($1_SRC_FILES))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   106
  IMPORT_TARGET_FILES += $$($1_DST_FILES)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   107
  $3/%: $2/%
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   108
	$(ECHO) $(LOG_INFO) Copying $$(@F)
15677
e0ab6fb02225 8008295: build-infra: Cleanup in Import.gmk
erikj
parents: 15139
diff changeset
   109
	$$(install-file)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   110
endef
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   111
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   112
#######
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   113
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   114
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   115
# Import hotspot
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   116
#
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   117
HOTSPOT_IMPORT_FILES := $(addprefix $(LIBRARY_PREFIX), jvm.* saproc.* jsig.* sawindbg.* jvm_db.* jvm_dtrace.*) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   118
    Xusage.txt sa-jdi.jar
14428
cacd70dfb133 8002028: build-infra: need no-hotspot partial build
tbell
parents: 14231
diff changeset
   119
$(eval $(call CopyDir,HOTSPOT0, $(HOTSPOT_LIB_DIR), $(INSTALL_LIBRARIES_HERE), $(HOTSPOT_IMPORT_FILES)))
cacd70dfb133 8002028: build-infra: need no-hotspot partial build
tbell
parents: 14231
diff changeset
   120
$(eval $(call CopyDir,HOTSPOT1, $(HOTSPOT_DIST)/lib, $(JDK_OUTPUTDIR)/lib, $(HOTSPOT_IMPORT_FILES)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   121
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   122
ifeq ($(OPENJDK_TARGET_OS), macosx)
21133
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   123
  JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig$(SHARED_LIBRARY_SUFFIX).dSYM) \
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   124
      $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   125
else
21131
7171b82a14c3 8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents: 20888
diff changeset
   126
  JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.debuginfo) \
21133
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   127
      $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   128
endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   129
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   130
ifneq ($(OPENJDK_TARGET_OS), windows)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   131
  ifeq ($(JVM_VARIANT_SERVER), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   132
    IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/server/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   133
    ifneq (, $(JSIG_DEBUGINFO))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   134
      IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/server/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   135
    endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   136
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   137
  ifeq ($(JVM_VARIANT_CLIENT), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   138
    IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   139
    ifneq (, $(JSIG_DEBUGINFO))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   140
      IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   141
    endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   142
  endif
21131
7171b82a14c3 8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents: 20888
diff changeset
   143
  ifneq ($(OPENJDK_TARGET_OS), macosx)
7171b82a14c3 8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents: 20888
diff changeset
   144
    ifeq ($(JVM_VARIANT_MINIMAL1), true)
7171b82a14c3 8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents: 20888
diff changeset
   145
      IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
7171b82a14c3 8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents: 20888
diff changeset
   146
      ifneq (,$(JSIG_DEBUGINFO))
7171b82a14c3 8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents: 20888
diff changeset
   147
        IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
7171b82a14c3 8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents: 20888
diff changeset
   148
      endif
15680
d379c4f7bb47 8006651: build-infra: Import.gmk needs to add support for the minimal VM
dholmes
parents: 15139
diff changeset
   149
    endif
21131
7171b82a14c3 8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents: 20888
diff changeset
   150
  endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   151
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   152
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   153
$(INSTALL_LIBRARIES_HERE)/server/%$(SHARED_LIBRARY_SUFFIX): $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   154
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   155
	$(RM) $@
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   156
	$(LN) -s ../$(@F) $@
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   157
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   158
ifeq ($(OPENJDK_TARGET_OS), macosx)
21133
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   159
  $(INSTALL_LIBRARIES_HERE)/server/%.dSYM : $(INSTALL_LIBRARIES_HERE)/%.dSYM
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   160
	$(MKDIR) -p $(@D)
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   161
	$(RM) $@
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   162
	$(LN) -s ../$(@F) $@
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   163
21133
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   164
  $(INSTALL_LIBRARIES_HERE)/server/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   165
	$(MKDIR) -p $(@D)
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   166
	$(RM) $@
21133
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   167
	$(RM) $@.tmp $(basename $@)$(SHARED_LIBRARY_SUFFIX).dSYM
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   168
	$(LN) -s ../$(basename $(@F))$(SHARED_LIBRARY_SUFFIX).dSYM $(basename $@)$(SHARED_LIBRARY_SUFFIX).dSYM
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   169
	$(CD) $(@D) && $(ZIP) -q -y $@.tmp $(basename $(@F))$(SHARED_LIBRARY_SUFFIX).dSYM
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   170
	$(RM) $(basename $@)$(SHARED_LIBRARY_SUFFIX).dSYM
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   171
	$(MV) $@.tmp $@
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   172
else
21133
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   173
  $(INSTALL_LIBRARIES_HERE)/server/%.debuginfo: $(INSTALL_LIBRARIES_HERE)/%.debuginfo
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   174
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   175
	$(RM) $@
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   176
	$(LN) -s ../$(@F) $@
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   177
21133
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   178
  $(INSTALL_LIBRARIES_HERE)/server/%.diz: $(INSTALL_LIBRARIES_HERE)/%.diz
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   179
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   180
	$(RM) $@
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   181
	$(RM) $@.tmp $(basename $@).debuginfo
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   182
	$(LN) -s ../$(basename $(@F)).debuginfo $(basename $@).debuginfo
15139
3ec04e4fbb5e 8006385: build-infra: linux and solaris *-debuginfo-*.zip file created from the new makefile has extra HUDSON direcotry in jre/lib/i386/server
erikj
parents: 14596
diff changeset
   183
	$(CD) $(@D) && $(ZIP) -q -y $@.tmp $(basename $(@F)).debuginfo
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   184
	$(RM) $(basename $@).debuginfo
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   185
	$(MV) $@.tmp $@
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   186
endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   187
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   188
$(INSTALL_LIBRARIES_HERE)/client/%$(SHARED_LIBRARY_SUFFIX): $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   189
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   190
	$(RM) $@
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   191
	$(LN) -s ../$(@F) $@
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   192
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   193
ifeq ($(OPENJDK_TARGET_OS), macosx)
21133
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   194
  $(INSTALL_LIBRARIES_HERE)/client/%.dSYM : $(INSTALL_LIBRARIES_HERE)/%.dSYM
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   195
	$(MKDIR) -p $(@D)
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   196
	$(RM) $@
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   197
	$(LN) -s ../$(@F) $@
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   198
21133
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   199
  $(INSTALL_LIBRARIES_HERE)/client/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   200
	$(MKDIR) -p $(@D)
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   201
	$(RM) $@
21133
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   202
	$(RM) $@.tmp $(basename $@)$(SHARED_LIBRARY_SUFFIX).dSYM
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   203
	$(LN) -s ../$(basename $(@F))$(SHARED_LIBRARY_SUFFIX).dSYM $(basename $@)$(SHARED_LIBRARY_SUFFIX).dSYM
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   204
	$(CD) $(@D) && $(ZIP) -q -y $@.tmp $(basename $(@F))$(SHARED_LIBRARY_SUFFIX).dSYM
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   205
	$(RM) $(basename $@)$(SHARED_LIBRARY_SUFFIX).dSYM
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   206
	$(MV) $@.tmp $@
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   207
else
21133
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   208
  $(INSTALL_LIBRARIES_HERE)/client/%.debuginfo: $(INSTALL_LIBRARIES_HERE)/%.debuginfo
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   209
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   210
	$(RM) $@
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   211
	$(LN) -s ../$(@F) $@
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   212
21133
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   213
  $(INSTALL_LIBRARIES_HERE)/client/%.diz: $(INSTALL_LIBRARIES_HERE)/%.diz
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   214
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   215
	$(RM) $@
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   216
	$(RM) $@.tmp $(basename $@).debuginfo
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   217
	$(LN) -s ../$(basename $(@F)).debuginfo $(basename $@).debuginfo
15139
3ec04e4fbb5e 8006385: build-infra: linux and solaris *-debuginfo-*.zip file created from the new makefile has extra HUDSON direcotry in jre/lib/i386/server
erikj
parents: 14596
diff changeset
   218
	$(CD) $(@D) && $(ZIP) -q -y $@.tmp $(basename $(@F)).debuginfo
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   219
	$(RM) $(basename $@).debuginfo
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   220
	$(MV) $@.tmp $@
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   221
endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   222
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   223
$(INSTALL_LIBRARIES_HERE)/minimal/%$(SHARED_LIBRARY_SUFFIX): $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX)
15680
d379c4f7bb47 8006651: build-infra: Import.gmk needs to add support for the minimal VM
dholmes
parents: 15139
diff changeset
   224
	$(MKDIR) -p $(@D)
d379c4f7bb47 8006651: build-infra: Import.gmk needs to add support for the minimal VM
dholmes
parents: 15139
diff changeset
   225
	$(RM) $@
d379c4f7bb47 8006651: build-infra: Import.gmk needs to add support for the minimal VM
dholmes
parents: 15139
diff changeset
   226
	$(LN) -s ../$(@F) $@
d379c4f7bb47 8006651: build-infra: Import.gmk needs to add support for the minimal VM
dholmes
parents: 15139
diff changeset
   227
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   228
ifneq ($(OPENJDK_TARGET_OS), macosx)
21133
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   229
  $(INSTALL_LIBRARIES_HERE)/minimal/%.debuginfo: $(INSTALL_LIBRARIES_HERE)/%.debuginfo
15680
d379c4f7bb47 8006651: build-infra: Import.gmk needs to add support for the minimal VM
dholmes
parents: 15139
diff changeset
   230
	$(MKDIR) -p $(@D)
d379c4f7bb47 8006651: build-infra: Import.gmk needs to add support for the minimal VM
dholmes
parents: 15139
diff changeset
   231
	$(RM) $@
d379c4f7bb47 8006651: build-infra: Import.gmk needs to add support for the minimal VM
dholmes
parents: 15139
diff changeset
   232
	$(LN) -s ../$(@F) $@
d379c4f7bb47 8006651: build-infra: Import.gmk needs to add support for the minimal VM
dholmes
parents: 15139
diff changeset
   233
21133
dcec14b84950 8027298: broken link in jdk8b113 macosx binaries
erikj
parents: 21131
diff changeset
   234
  $(INSTALL_LIBRARIES_HERE)/minimal/%.diz: $(INSTALL_LIBRARIES_HERE)/%.diz
15680
d379c4f7bb47 8006651: build-infra: Import.gmk needs to add support for the minimal VM
dholmes
parents: 15139
diff changeset
   235
	$(MKDIR) -p $(@D)
d379c4f7bb47 8006651: build-infra: Import.gmk needs to add support for the minimal VM
dholmes
parents: 15139
diff changeset
   236
	$(RM) $@
d379c4f7bb47 8006651: build-infra: Import.gmk needs to add support for the minimal VM
dholmes
parents: 15139
diff changeset
   237
	$(RM) $@.tmp $(basename $@).debuginfo
d379c4f7bb47 8006651: build-infra: Import.gmk needs to add support for the minimal VM
dholmes
parents: 15139
diff changeset
   238
	$(LN) -s ../$(basename $(@F)).debuginfo $(basename $@).debuginfo
d379c4f7bb47 8006651: build-infra: Import.gmk needs to add support for the minimal VM
dholmes
parents: 15139
diff changeset
   239
	$(CD) $(@D) && $(ZIP) -q -y $@.tmp $(basename $(@F)).debuginfo
d379c4f7bb47 8006651: build-infra: Import.gmk needs to add support for the minimal VM
dholmes
parents: 15139
diff changeset
   240
	$(RM) $(basename $@).debuginfo
d379c4f7bb47 8006651: build-infra: Import.gmk needs to add support for the minimal VM
dholmes
parents: 15139
diff changeset
   241
	$(MV) $@.tmp $@
20887
e6ca3d58bfe9 7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents: 17957
diff changeset
   242
endif
15680
d379c4f7bb47 8006651: build-infra: Import.gmk needs to add support for the minimal VM
dholmes
parents: 15139
diff changeset
   243
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   244
##########################################################################################
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   245
# Unpack the binary distributions of the crypto classes if they exist.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   246
SEC_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/sec-bin.zip
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   247
SEC_FILES_WIN_ZIP := $(JDK_TOPDIR)/make/tools/crypto/sec-windows-bin.zip
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   248
JGSS_WIN32_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/jgss-windows-i586-bin.zip
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   249
JGSS_WIN64_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/jgss-windows-x64-bin.zip
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   250
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   251
define unzip-sec-file
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   252
	$(ECHO) Unzipping $(<F)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   253
	$(MKDIR) -p $(@D)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   254
	$(RM) $@
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   255
	($(CD) $(JDK_OUTPUTDIR) && $(UNZIP) $< > $@.tmp)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   256
	$(MV) $@.tmp $@
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   257
endef
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   258
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   259
$(JDK_OUTPUTDIR)/classes/_the.sec-bin.unzipped: $(SEC_FILES_ZIP)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   260
	$(call unzip-sec-file)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   261
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   262
$(JDK_OUTPUTDIR)/classes/_the.sec-windows-bin.unzipped: $(SEC_FILES_WIN_ZIP)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   263
	$(call unzip-sec-file)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   264
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   265
$(JDK_OUTPUTDIR)/classes/_the.jgss-windows-i586-bin.unzipped: $(JGSS_WIN32_FILES_ZIP)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   266
	$(call unzip-sec-file)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   267
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   268
$(JDK_OUTPUTDIR)/classes/_the.jgss-windows-x64-bin.unzipped: $(JGSS_WIN64_FILES_ZIP)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   269
	$(call unzip-sec-file)
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   270
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   271
ifneq ($(wildcard $(SEC_FILES_ZIP)), )
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   272
  IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.sec-bin.unzipped
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   273
  ifeq ($(OPENJDK_TARGET_OS), windows)
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   274
    IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.sec-windows-bin.unzipped
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   275
    ifeq ($(OPENJDK_TARGET_CPU), x86)
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   276
      IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.jgss-windows-i586-bin.unzipped
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   277
    endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 17957
diff changeset
   278
    ifeq ($(OPENJDK_TARGET_CPU), x86_64)
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   279
      IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.jgss-windows-x64-bin.unzipped
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   280
    endif
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   281
  endif
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   282
endif
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   283
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 15691
diff changeset
   284
##########################################################################################
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   285
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents:
diff changeset
   286
all: $(IMPORT_TARGET_FILES)