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