author | naoto |
Thu, 19 Jul 2018 11:15:38 -0700 | |
changeset 51169 | 0058ffa0a922 |
parent 50471 | f0aeede1b855 |
child 51783 | 4482acfef2a5 |
child 56721 | 01b558efd286 |
permissions | -rw-r--r-- |
25859 | 1 |
# |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48751
diff
changeset
|
2 |
# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. |
25859 | 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 |
include LibCommon.gmk |
|
27 |
||
30351 | 28 |
# Hook to include the corresponding custom file, if present. |
47314 | 29 |
$(eval $(call IncludeCustomExtension, lib/Lib-java.instrument.gmk)) |
30351 | 30 |
|
25859 | 31 |
################################################################################ |
32 |
||
33 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
34 |
# Statically link the C runtime so that there are not dependencies on modules |
|
35 |
# not on the search patch when invoked from the Windows system directory |
|
36 |
# (or elsewhere). |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
49440
diff
changeset
|
37 |
LIBINSTRUMENT_CFLAGS_JDKLIB := $(filter-out -MD, $(CFLAGS_JDKLIB)) |
25859 | 38 |
# equivalent of strcasecmp is stricmp on Windows |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
49440
diff
changeset
|
39 |
LIBINSTRUMENT_CFLAGS := -Dstrcasecmp=stricmp |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
49440
diff
changeset
|
40 |
else |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
49440
diff
changeset
|
41 |
LIBINSTRUMENT_CFLAGS_JDKLIB := $(CFLAGS_JDKLIB) |
25859 | 42 |
endif |
43 |
||
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49070
diff
changeset
|
44 |
$(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48751
diff
changeset
|
45 |
NAME := instrument, \ |
25859 | 46 |
OPTIMIZATION := LOW, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
49440
diff
changeset
|
47 |
CFLAGS := $(LIBINSTRUMENT_CFLAGS_JDKLIB) $(LIBINSTRUMENT_CFLAGS), \ |
25859 | 48 |
CFLAGS_debug := -DJPLIS_LOGGING, \ |
49 |
CFLAGS_release := -DNO_JPLIS_LOGGING, \ |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
49440
diff
changeset
|
50 |
EXTRA_HEADER_DIRS := java.base:libjli, \ |
25859 | 51 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
52 |
$(call SET_SHARED_LIBRARY_ORIGIN) \ |
|
53 |
$(LIBINSTRUMENT_LDFLAGS), \ |
|
33406 | 54 |
LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli) \ |
55 |
-L$(call FindLibDirForModule, java.base)/jli, \ |
|
56 |
LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli) \ |
|
57 |
-L$(call FindLibDirForModule, java.base)/jli, \ |
|
34695
7a6cc9982d22
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33518
diff
changeset
|
58 |
LDFLAGS_macosx := -Wl$(COMMA)-all_load, \ |
33406 | 59 |
LDFLAGS_aix := -L$(SUPPORT_OUTPUTDIR)/native/java.base, \ |
33518
3f1644328d06
8141290: AIX: fix build after '8140661: Rename LDFLAGS_SUFFIX to LIBS'
simonis
parents:
33406
diff
changeset
|
60 |
LIBS := $(JDKLIB_LIBS), \ |
48751
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47314
diff
changeset
|
61 |
LIBS_unix := -ljava -ljvm $(LIBZ_LIBS), \ |
33406 | 62 |
LIBS_linux := -ljli $(LIBDL), \ |
33518
3f1644328d06
8141290: AIX: fix build after '8140661: Rename LDFLAGS_SUFFIX to LIBS'
simonis
parents:
33406
diff
changeset
|
63 |
LIBS_solaris := -ljli $(LIBDL), \ |
3f1644328d06
8141290: AIX: fix build after '8140661: Rename LDFLAGS_SUFFIX to LIBS'
simonis
parents:
33406
diff
changeset
|
64 |
LIBS_aix := -liconv -ljli_static $(LIBDL), \ |
33406 | 65 |
LIBS_macosx := -liconv -framework Cocoa -framework Security \ |
34695
7a6cc9982d22
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33518
diff
changeset
|
66 |
-framework ApplicationServices \ |
49261
d5c43e9f08fb
8199745: JDK-8199668 introduced a build race on macosx
erikj
parents:
49244
diff
changeset
|
67 |
$(call FindStaticLib, java.base, jli_static), \ |
36511 | 68 |
LIBS_windows := jvm.lib $(WIN_JAVA_LIB) advapi32.lib \ |
49261
d5c43e9f08fb
8199745: JDK-8199668 introduced a build race on macosx
erikj
parents:
49244
diff
changeset
|
69 |
$(call FindStaticLib, java.base, jli_static), \ |
35276 | 70 |
)) |
25859 | 71 |
|
49261
d5c43e9f08fb
8199745: JDK-8199668 introduced a build race on macosx
erikj
parents:
49244
diff
changeset
|
72 |
ifneq ($(filter $(OPENJDK_TARGET_OS), macosx windows aix), ) |
d5c43e9f08fb
8199745: JDK-8199668 introduced a build race on macosx
erikj
parents:
49244
diff
changeset
|
73 |
$(BUILD_LIBINSTRUMENT): $(call FindStaticLib, java.base, jli_static) |
25859 | 74 |
else |
27565 | 75 |
$(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, jli, /jli) |
25859 | 76 |
endif |
49261
d5c43e9f08fb
8199745: JDK-8199668 introduced a build race on macosx
erikj
parents:
49244
diff
changeset
|
77 |
$(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, java) |
25859 | 78 |
|
27565 | 79 |
TARGETS += $(BUILD_LIBINSTRUMENT) |
25859 | 80 |
|
81 |
################################################################################ |