author | ghaug |
Mon, 13 Aug 2018 12:24:25 +0200 | |
changeset 51382 | 0038e99f93bc |
parent 50604 | 929621cf06b4 |
child 51669 | 480486f31b3b |
child 56873 | af61810ccd5b |
permissions | -rw-r--r-- |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1 |
# |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
2 |
# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
4 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
5 |
# This code is free software; you can redistribute it and/or modify it |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
7 |
# published by the Free Software Foundation. Oracle designates this |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
8 |
# particular file as subject to the "Classpath" exception as provided |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
10 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
15 |
# accompanied this code). |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
16 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
17 |
# You should have received a copy of the GNU General Public License version |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
20 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
22 |
# or visit www.oracle.com if you need additional information or have any |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
23 |
# questions. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
24 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
25 |
|
27565 | 26 |
WIN_VERIFY_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libverify/verify.lib |
13702 | 27 |
|
35262
6ffcba13c973
8138677: IllegalAccessException Class sun.usagetracker.UsageTrackerClient$4 (module java.base) can not access a member of class java.lang.management.ManagementFactory (module java.management)
jbachorik
parents:
34014
diff
changeset
|
28 |
# Hook to include the corresponding custom file, if present. |
47314 | 29 |
$(eval $(call IncludeCustomExtension, lib/CoreLibraries.gmk)) |
35262
6ffcba13c973
8138677: IllegalAccessException Class sun.usagetracker.UsageTrackerClient$4 (module java.base) can not access a member of class java.lang.management.ManagementFactory (module java.management)
jbachorik
parents:
34014
diff
changeset
|
30 |
|
6ffcba13c973
8138677: IllegalAccessException Class sun.usagetracker.UsageTrackerClient$4 (module java.base) can not access a member of class java.lang.management.ManagementFactory (module java.management)
jbachorik
parents:
34014
diff
changeset
|
31 |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
32 |
########################################################################################## |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
28999
diff
changeset
|
33 |
# libfdlibm is statically linked with libjava below and not delivered into the |
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25859
diff
changeset
|
34 |
# product on its own. |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
35 |
|
42353
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
36 |
BUILD_LIBFDLIBM_OPTIMIZATION := NONE |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
37 |
|
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
38 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
39 |
BUILD_LIBFDLIBM_OPTIMIZATION := HIGH |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
40 |
endif |
13164 | 41 |
|
42353
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
42 |
ifeq ($(OPENJDK_TARGET_OS), linux) |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
43 |
ifeq ($(OPENJDK_TARGET_CPU), ppc64) |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
44 |
BUILD_LIBFDLIBM_OPTIMIZATION := HIGH |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
45 |
else ifeq ($(OPENJDK_TARGET_CPU), ppc64le) |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
46 |
BUILD_LIBFDLIBM_OPTIMIZATION := HIGH |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
47 |
else ifeq ($(OPENJDK_TARGET_CPU), s390x) |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
48 |
BUILD_LIBFDLIBM_OPTIMIZATION := HIGH |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
49 |
else ifeq ($(OPENJDK_TARGET_CPU), aarch64) |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
50 |
BUILD_LIBFDLIBM_OPTIMIZATION := HIGH |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
51 |
endif |
12892 | 52 |
endif |
53 |
||
47217 | 54 |
LIBFDLIBM_SRC := $(TOPDIR)/src/java.base/share/native/libfdlibm |
25859 | 55 |
LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC) |
56 |
||
20547 | 57 |
ifneq ($(OPENJDK_TARGET_OS), macosx) |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
58 |
$(eval $(call SetupNativeCompilation, BUILD_LIBFDLIBM, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
59 |
NAME := fdlibm, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
60 |
TYPE := STATIC_LIBRARY, \ |
27565 | 61 |
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ |
25859 | 62 |
SRC := $(LIBFDLIBM_SRC), \ |
20547 | 63 |
OPTIMIZATION := $(BUILD_LIBFDLIBM_OPTIMIZATION), \ |
25859 | 64 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ |
20547 | 65 |
CFLAGS_windows_debug := -DLOGGING, \ |
22594 | 66 |
CFLAGS_aix := -qfloat=nomaf, \ |
42353
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
67 |
CFLAGS_linux_ppc64 := -ffp-contract=off, \ |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
68 |
CFLAGS_linux_ppc64le := -ffp-contract=off, \ |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
69 |
CFLAGS_linux_s390x := -ffp-contract=off, \ |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
70 |
CFLAGS_linux_aarch64 := -ffp-contract=off, \ |
48766
2c4d1993b5f9
8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents:
48751
diff
changeset
|
71 |
DISABLED_WARNINGS_gcc := sign-compare misleading-indentation, \ |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
28999
diff
changeset
|
72 |
DISABLED_WARNINGS_microsoft := 4146 4244 4018, \ |
20547 | 73 |
ARFLAGS := $(ARFLAGS), \ |
27565 | 74 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ |
35276 | 75 |
)) |
13164 | 76 |
|
12892 | 77 |
else |
14855
d104ff4d4bb9
8005178: build-infra: Dependency on libfdlibm on mac is broken
erikj
parents:
14789
diff
changeset
|
78 |
|
20890 | 79 |
# On macosx the old build does partial (incremental) linking of fdlibm instead of |
80 |
# a plain static library. |
|
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
81 |
$(eval $(call SetupNativeCompilation, BUILD_LIBFDLIBM_MAC, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
82 |
NAME := fdlibm, \ |
27565 | 83 |
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ |
25859 | 84 |
SRC := $(LIBFDLIBM_SRC), \ |
85 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ |
|
48751
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47687
diff
changeset
|
86 |
LDFLAGS := -nostdlib $(ARFLAGS), \ |
27565 | 87 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ |
35276 | 88 |
)) |
20547 | 89 |
|
27565 | 90 |
BUILD_LIBFDLIBM := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX) |
20547 | 91 |
$(BUILD_LIBFDLIBM): $(BUILD_LIBFDLIBM_MAC) |
16636
1cc691bcfe50
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
16513
diff
changeset
|
92 |
$(call install-file) |
12892 | 93 |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
94 |
endif |
20890 | 95 |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
96 |
########################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
97 |
|
20547 | 98 |
LIBVERIFY_OPTIMIZATION := HIGH |
99 |
ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), ) |
|
35276 | 100 |
ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true) |
20547 | 101 |
LIBVERIFY_OPTIMIZATION := LOW |
102 |
endif |
|
13702 | 103 |
endif |
104 |
||
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
105 |
$(eval $(call SetupJdkLibrary, BUILD_LIBVERIFY, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
106 |
NAME := verify, \ |
20547 | 107 |
OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \ |
108 |
CFLAGS := $(CFLAGS_JDKLIB), \ |
|
48766
2c4d1993b5f9
8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents:
48751
diff
changeset
|
109 |
DISABLED_WARNINGS_gcc := implicit-fallthrough, \ |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
28999
diff
changeset
|
110 |
DISABLED_WARNINGS_microsoft := 4244 4267, \ |
20547 | 111 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
112 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
49241 | 113 |
LIBS_unix := -ljvm, \ |
33406 | 114 |
LIBS_windows := jvm.lib, \ |
35276 | 115 |
)) |
13164 | 116 |
|
27565 | 117 |
TARGETS += $(BUILD_LIBVERIFY) |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
118 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
119 |
########################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
120 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
121 |
LIBJAVA_CFLAGS := -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"' |
13164 | 122 |
|
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
123 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
20547 | 124 |
BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c |
125 |
BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c |
|
13164 | 126 |
endif |
127 |
||
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
128 |
$(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
129 |
NAME := java, \ |
20547 | 130 |
OPTIMIZATION := HIGH, \ |
131 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
|
132 |
$(LIBJAVA_CFLAGS), \ |
|
33984
2333676816eb
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30784
diff
changeset
|
133 |
System.c_CFLAGS := $(VERSION_CFLAGS), \ |
2333676816eb
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30784
diff
changeset
|
134 |
jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
135 |
EXTRA_HEADER_DIRS := libfdlibm, \ |
37529
868c7195632c
8154087: Fix AIX and Linux/ppc64le after the integration of the new hotspot build
simonis
parents:
37525
diff
changeset
|
136 |
WARNINGS_AS_ERRORS_xlc := false, \ |
36511 | 137 |
DISABLED_WARNINGS_gcc := unused-result, \ |
32408
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
32267
diff
changeset
|
138 |
DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ |
20547 | 139 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
140 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
33406 | 141 |
LDFLAGS_macosx := -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/, \ |
49440 | 142 |
LDFLAGS_windows := -delayload:shell32.dll, \ |
33406 | 143 |
LIBS_unix := -ljvm -lverify, \ |
144 |
LIBS_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \ |
|
49241 | 145 |
LIBS_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM), \ |
36110
91a3a6df36ec
8150203: Incremental update from build-infra project
ihse
parents:
35706
diff
changeset
|
146 |
LIBS_aix := $(LIBDL) $(BUILD_LIBFDLIBM) $(LIBM),\ |
33406 | 147 |
LIBS_macosx := -lfdlibm \ |
20547 | 148 |
-framework CoreFoundation \ |
149 |
-framework Foundation \ |
|
150 |
-framework Security -framework SystemConfiguration, \ |
|
33406 | 151 |
LIBS_windows := jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \ |
152 |
shell32.lib delayimp.lib \ |
|
31246
dfc58fd4feec
8066504: GetVersionEx in java.base/windows/native/libjava/java_props_md.c might not get correct Windows version 0
rriggs
parents:
30784
diff
changeset
|
153 |
advapi32.lib version.lib, \ |
35276 | 154 |
)) |
13164 | 155 |
|
27565 | 156 |
TARGETS += $(BUILD_LIBJAVA) |
20547 | 157 |
|
158 |
$(BUILD_LIBJAVA): $(BUILD_LIBVERIFY) |
|
159 |
||
160 |
$(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM) |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
161 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
162 |
########################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
163 |
|
20547 | 164 |
BUILD_LIBZIP_EXCLUDES := |
165 |
ifeq ($(USE_EXTERNAL_LIBZ), true) |
|
43806 | 166 |
LIBZIP_EXCLUDES += zlib |
20547 | 167 |
endif |
168 |
||
169 |
ifeq ($(LIBZIP_CAN_USE_MMAP), true) |
|
170 |
BUILD_LIBZIP_MMAP := -DUSE_MMAP |
|
171 |
endif |
|
172 |
||
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
173 |
$(eval $(call SetupJdkLibrary, BUILD_LIBZIP, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
174 |
NAME := zip, \ |
20547 | 175 |
OPTIMIZATION := LOW, \ |
176 |
EXCLUDES := $(LIBZIP_EXCLUDES), \ |
|
177 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
178 |
$(LIBZ_CFLAGS), \ |
27736
8c9bd4be4a86
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
27186
diff
changeset
|
179 |
CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \ |
20547 | 180 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
33406 | 181 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
48751
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47687
diff
changeset
|
182 |
LIBS_unix := -ljvm -ljava $(LIBZ_LIBS), \ |
33406 | 183 |
LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \ |
35276 | 184 |
)) |
20547 | 185 |
|
186 |
$(BUILD_LIBZIP): $(BUILD_LIBJAVA) |
|
187 |
||
27565 | 188 |
TARGETS += $(BUILD_LIBZIP) |
20547 | 189 |
|
190 |
########################################################################################## |
|
191 |
||
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
192 |
$(eval $(call SetupJdkLibrary, BUILD_LIBJIMAGE, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
193 |
NAME := jimage, \ |
41217
c3bdba3a880a
8160630: libjimage.so and others should link statically to libgcc
erikj
parents:
38783
diff
changeset
|
194 |
TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
195 |
OPTIMIZATION := LOW, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
196 |
CFLAGS := $(CFLAGS_JDKLIB), \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
197 |
CXXFLAGS := $(CXXFLAGS_JDKLIB), \ |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
198 |
CFLAGS_unix := -UDEBUG, \ |
41475 | 199 |
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ |
33406 | 200 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
201 |
LIBS_unix := -ljvm -ldl $(LIBCXX), \ |
|
202 |
LIBS_macosx := -lc++, \ |
|
203 |
LIBS_windows := jvm.lib, \ |
|
35276 | 204 |
)) |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
205 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
206 |
$(BUILD_LIBJIMAGE): $(BUILD_LIBJAVA) |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
207 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
208 |
TARGETS += $(BUILD_LIBJIMAGE) |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
209 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
210 |
########################################################################################## |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
211 |
|
47687 | 212 |
ifeq ($(call check-jvm-variant, zero), true) |
20547 | 213 |
ERGO_FAMILY := zero |
214 |
else |
|
215 |
ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86) |
|
216 |
ERGO_FAMILY := i586 |
|
217 |
else |
|
218 |
ERGO_FAMILY := $(OPENJDK_TARGET_CPU_ARCH) |
|
219 |
endif |
|
220 |
endif |
|
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
221 |
LIBJLI_ALL_ERGO := $(wildcard $(addsuffix /ergo_*.c, $(LIBJLI_SRC_DIRS))) |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
222 |
LIBJLI_EXCLUDE_ERGO := $(filter-out %/ergo_$(ERGO_FAMILY).c, $(LIBJLI_ALL_ERGO)) |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
223 |
# If all specialized ergo files are excluded, use generic ergo |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
224 |
ifeq ($(LIBJLI_ALL_ERGO), $(LIBJLI_EXCLUDE_ERGO)) |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
225 |
LIBJLI_CFLAGS += -DUSE_GENERIC_ERGO |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
226 |
endif |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
227 |
LIBJLI_EXCLUDE_FILES += $(notdir $(LIBJLI_EXCLUDE_ERGO)) |
20547 | 228 |
|
229 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
29742
b73f38796859
8074840: Resolve disabled warnings for libjli and libjli_static
mikael
parents:
29374
diff
changeset
|
230 |
LIBJLI_EXCLUDE_FILES += java_md_solinux.c ergo.c ergo_i586.c |
20547 | 231 |
|
232 |
BUILD_LIBJLI_java_md_macosx.c_CFLAGS := -x objective-c |
|
233 |
BUILD_LIBJLI_STATIC_java_md_macosx.c_CFLAGS := -x objective-c |
|
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
234 |
|
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
235 |
LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" |
20547 | 236 |
endif |
237 |
||
238 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
239 |
# Staticically link with c runtime on windows. |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
240 |
LIBJLI_CFLAGS_JDKLIB := $(filter-out -MD, $(CFLAGS_JDKLIB)) |
20547 | 241 |
LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE) |
28984
12031ba2dc38
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27799
diff
changeset
|
242 |
# Supply the name of the C runtime lib. |
12031ba2dc38
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27799
diff
changeset
|
243 |
LIBJLI_CFLAGS += -DMSVCR_DLL_NAME='"$(notdir $(MSVCR_DLL))"' |
12031ba2dc38
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27799
diff
changeset
|
244 |
ifneq ($(MSVCP_DLL), ) |
12031ba2dc38
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27799
diff
changeset
|
245 |
LIBJLI_CFLAGS += -DMSVCP_DLL_NAME='"$(notdir $(MSVCP_DLL))"' |
12031ba2dc38
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27799
diff
changeset
|
246 |
endif |
20547 | 247 |
else |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
248 |
LIBJLI_CFLAGS_JDKLIB := $(CFLAGS_JDKLIB) |
20547 | 249 |
LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)/jli |
250 |
endif |
|
251 |
||
48751
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47687
diff
changeset
|
252 |
LIBJLI_CFLAGS += $(LIBZ_CFLAGS) |
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47687
diff
changeset
|
253 |
|
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
254 |
ifneq ($(USE_EXTERNAL_LIBZ), true) |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
255 |
LIBJLI_EXTRA_FILES += \ |
47217 | 256 |
$(addprefix $(TOPDIR)/src/java.base/share/native/libzip/zlib/, \ |
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
257 |
inflate.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
258 |
inftrees.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
259 |
inffast.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
260 |
zadler32.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
261 |
zcrc32.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
262 |
zutil.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
263 |
) |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
264 |
endif |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
265 |
|
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
266 |
$(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
267 |
NAME := jli, \ |
20547 | 268 |
OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \ |
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
269 |
EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
270 |
EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ |
20547 | 271 |
OPTIMIZATION := HIGH, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
272 |
CFLAGS := $(LIBJLI_CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \ |
32408
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
32267
diff
changeset
|
273 |
DISABLED_WARNINGS_solstudio := \ |
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
32267
diff
changeset
|
274 |
E_ASM_DISABLES_OPTIMIZATION \ |
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
32267
diff
changeset
|
275 |
E_STATEMENT_NOT_REACHED, \ |
20547 | 276 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
277 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
278 |
LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
|
279 |
LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
|
48751
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47687
diff
changeset
|
280 |
LIBS_unix := $(LIBZ_LIBS), \ |
49241 | 281 |
LIBS_linux := $(LIBDL) -lpthread, \ |
282 |
LIBS_solaris := $(LIBDL), \ |
|
33406 | 283 |
LIBS_aix := $(LIBDL),\ |
284 |
LIBS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \ |
|
285 |
LIBS_windows := advapi32.lib comctl32.lib user32.lib, \ |
|
35276 | 286 |
)) |
20547 | 287 |
|
27565 | 288 |
TARGETS += $(BUILD_LIBJLI) |
20547 | 289 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
290 |
LIBJLI_SRC_DIRS := $(call FindSrcDirsForComponent, java.base, libjli) |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
291 |
|
20547 | 292 |
# On windows, the static library has the same suffix as the import library created by |
293 |
# with the shared library, so the static library is given a different name. No harm |
|
294 |
# in doing it for all platform to reduce complexity. |
|
295 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
296 |
$(eval $(call SetupNativeCompilation, BUILD_LIBJLI_STATIC, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
297 |
NAME := jli_static, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
298 |
TYPE := STATIC_LIBRARY, \ |
27565 | 299 |
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ |
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
300 |
SRC := $(LIBJLI_SRC_DIRS), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
301 |
EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
302 |
EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ |
20547 | 303 |
OPTIMIZATION := HIGH, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
304 |
CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS_JDKLIB) $(LIBJLI_CFLAGS) \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
305 |
$(addprefix -I, $(LIBJLI_SRC_DIRS)), \ |
20547 | 306 |
ARFLAGS := $(ARFLAGS), \ |
27565 | 307 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \ |
35276 | 308 |
)) |
20547 | 309 |
|
27565 | 310 |
TARGETS += $(BUILD_LIBJLI_STATIC) |
20547 | 311 |
|
312 |
else ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
313 |
# |
|
314 |
# On macosx they do partial (incremental) linking of libjli_static.a |
|
315 |
# code it here...rather than add support to NativeCompilation |
|
316 |
# as this is first time I see it |
|
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
317 |
$(eval $(call SetupNativeCompilation, BUILD_LIBJLI_STATIC, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
318 |
NAME := jli_static, \ |
27565 | 319 |
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ |
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
320 |
SRC := $(LIBJLI_SRC_DIRS), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
321 |
EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
322 |
EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ |
20547 | 323 |
OPTIMIZATION := HIGH, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
324 |
CFLAGS := $(LIBJLI_CFLAGS_JDKLIB) $(LIBJLI_CFLAGS) \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
325 |
$(addprefix -I, $(LIBJLI_SRC_DIRS)), \ |
48751
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47687
diff
changeset
|
326 |
LDFLAGS := -nostdlib $(ARFLAGS), \ |
27565 | 327 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \ |
35276 | 328 |
)) |
20547 | 329 |
|
33653
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32846
diff
changeset
|
330 |
ifeq ($(STATIC_BUILD), true) |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32846
diff
changeset
|
331 |
TARGETS += $(BUILD_LIBJLI_STATIC) |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32846
diff
changeset
|
332 |
else |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32846
diff
changeset
|
333 |
$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a: $(BUILD_LIBJLI_STATIC) |
20547 | 334 |
$(call install-file) |
335 |
||
33653
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32846
diff
changeset
|
336 |
TARGETS += $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32846
diff
changeset
|
337 |
endif |
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
338 |
|
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
339 |
else ifeq ($(OPENJDK_TARGET_OS), aix) |
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
340 |
# AIX also requires a static libjli because the compiler doesn't support '-rpath' |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
341 |
$(eval $(call SetupNativeCompilation, BUILD_LIBJLI_STATIC, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
342 |
NAME := jli_static, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
343 |
TYPE := STATIC_LIBRARY, \ |
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
344 |
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
345 |
SRC := $(LIBJLI_SRC_DIRS), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
346 |
EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
347 |
EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
348 |
OPTIMIZATION := HIGH, \ |
50506
54fcaffa8fac
8204684: [AIX] Build of libjli_static broken after change 8204572 (SetupJdkLibrary)
simonis
parents:
50471
diff
changeset
|
349 |
CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS_JDKLIB) $(LIBJLI_CFLAGS) \ |
54fcaffa8fac
8204684: [AIX] Build of libjli_static broken after change 8204572 (SetupJdkLibrary)
simonis
parents:
50471
diff
changeset
|
350 |
$(addprefix -I, $(LIBJLI_SRC_DIRS)), \ |
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
351 |
ARFLAGS := $(ARFLAGS), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
352 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static)) |
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
353 |
|
27565 | 354 |
TARGETS += $(BUILD_LIBJLI_STATIC) |
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
355 |
|
20547 | 356 |
endif |