make/lib/Lib-java.instrument.gmk
author erikj
Fri, 16 Mar 2018 21:40:09 +0100
changeset 49261 d5c43e9f08fb
parent 49244 995a5556edfa
child 49440 396ea30afbd5
permissions -rw-r--r--
8199745: JDK-8199668 introduced a build race on macosx Reviewed-by: tbell
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     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
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     4
#
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    10
#
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    15
# accompanied this code).
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    16
#
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    20
#
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    23
# questions.
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    24
#
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    25
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    26
include LibCommon.gmk
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    27
30351
94434dd8dc9f 8077137: Port jdk.internal.instrumentation to jdk 9
sla
parents: 27944
diff changeset
    28
# Hook to include the corresponding custom file, if present.
47314
743814386712 8188814: Simplify IncludeCustomExtension
ihse
parents: 47217
diff changeset
    29
$(eval $(call IncludeCustomExtension, lib/Lib-java.instrument.gmk))
30351
94434dd8dc9f 8077137: Port jdk.internal.instrumentation to jdk 9
sla
parents: 27944
diff changeset
    30
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    31
################################################################################
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    32
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    33
LIBINSTRUMENT_SRC := $(TOPDIR)/src/java.instrument/share/native/libinstrument \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    34
    $(TOPDIR)/src/java.instrument/$(OPENJDK_TARGET_OS_TYPE)/native/libinstrument \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    35
    #
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    36
LIBINSTRUMENT_CFLAGS := $(CFLAGS_JDKLIB) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    37
    $(addprefix -I, $(LIBINSTRUMENT_SRC)) \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 25859
diff changeset
    38
    -I$(SUPPORT_OUTPUTDIR)/headers/java.instrument \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    39
    -I$(TOPDIR)/src/java.base/share/native/libjli \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    40
    -I$(TOPDIR)/src/java.base/share/native/libjava \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    41
    #
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    42
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    43
ifeq ($(OPENJDK_TARGET_OS), windows)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    44
  # Statically link the C runtime so that there are not dependencies on modules
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    45
  # not on the search patch when invoked from the Windows system directory
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    46
  # (or elsewhere).
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    47
  LIBINSTRUMENT_CFLAGS := $(filter-out -MD, $(LIBINSTRUMENT_CFLAGS))
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    48
  # equivalent of strcasecmp is stricmp on Windows
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    49
  LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    50
endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    51
49244
995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents: 49070
diff changeset
    52
$(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \
49070
d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents: 48751
diff changeset
    53
    NAME := instrument, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    54
    SRC := $(LIBINSTRUMENT_SRC), \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    55
    OPTIMIZATION := LOW, \
31069
14be2fa211f6 8081616: Remove hard-coded CFLAGS_WARNINGS_ARE_ERRORS to fully respect --disable-warnings-as-errors
ihse
parents: 30365
diff changeset
    56
    CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    57
    CFLAGS_debug := -DJPLIS_LOGGING, \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    58
    CFLAGS_release := -DNO_JPLIS_LOGGING, \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    59
    MAPFILE := $(TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    60
    LDFLAGS := $(LDFLAGS_JDKLIB) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    61
        $(call SET_SHARED_LIBRARY_ORIGIN) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    62
        $(LIBINSTRUMENT_LDFLAGS), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 31069
diff changeset
    63
    LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli) \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 31069
diff changeset
    64
        -L$(call FindLibDirForModule, java.base)/jli, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 31069
diff changeset
    65
    LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli) \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 31069
diff changeset
    66
        -L$(call FindLibDirForModule, java.base)/jli, \
34695
7a6cc9982d22 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33518
diff changeset
    67
    LDFLAGS_macosx := -Wl$(COMMA)-all_load, \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 31069
diff changeset
    68
    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
    69
    LIBS := $(JDKLIB_LIBS), \
48751
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents: 47314
diff changeset
    70
    LIBS_unix := -ljava -ljvm $(LIBZ_LIBS), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 31069
diff changeset
    71
    LIBS_linux := -ljli $(LIBDL), \
33518
3f1644328d06 8141290: AIX: fix build after '8140661: Rename LDFLAGS_SUFFIX to LIBS'
simonis
parents: 33406
diff changeset
    72
    LIBS_solaris := -ljli $(LIBDL), \
3f1644328d06 8141290: AIX: fix build after '8140661: Rename LDFLAGS_SUFFIX to LIBS'
simonis
parents: 33406
diff changeset
    73
    LIBS_aix := -liconv -ljli_static $(LIBDL), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 31069
diff changeset
    74
    LIBS_macosx := -liconv -framework Cocoa -framework Security \
34695
7a6cc9982d22 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33518
diff changeset
    75
        -framework ApplicationServices \
49261
d5c43e9f08fb 8199745: JDK-8199668 introduced a build race on macosx
erikj
parents: 49244
diff changeset
    76
        $(call FindStaticLib, java.base, jli_static), \
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents: 36110
diff changeset
    77
    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
    78
        $(call FindStaticLib, java.base, jli_static), \
35276
50b3cdcef339 8145596: Enable debug symbols for all libraries
ihse
parents: 34695
diff changeset
    79
))
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    80
49261
d5c43e9f08fb 8199745: JDK-8199668 introduced a build race on macosx
erikj
parents: 49244
diff changeset
    81
ifneq ($(filter $(OPENJDK_TARGET_OS), macosx windows aix), )
d5c43e9f08fb 8199745: JDK-8199668 introduced a build race on macosx
erikj
parents: 49244
diff changeset
    82
  $(BUILD_LIBINSTRUMENT): $(call FindStaticLib, java.base, jli_static)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    83
else
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 25859
diff changeset
    84
  $(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, jli, /jli)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    85
endif
49261
d5c43e9f08fb 8199745: JDK-8199668 introduced a build race on macosx
erikj
parents: 49244
diff changeset
    86
$(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, java)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    87
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 25859
diff changeset
    88
TARGETS += $(BUILD_LIBINSTRUMENT)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    89
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    90
################################################################################