< prev index next >

jdk/make/lib/Lib-java.instrument.gmk

Print this page

        

*** 1,7 **** # ! # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this --- 1,7 ---- # ! # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this
*** 36,45 **** --- 36,46 ---- LIBINSTRUMENT_CFLAGS := $(CFLAGS_JDKLIB) \ $(addprefix -I, $(LIBINSTRUMENT_SRC)) \ -I$(SUPPORT_OUTPUTDIR)/headers/java.instrument \ -I$(JDK_TOPDIR)/src/java.base/share/native/libjli \ -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ + $(ICONV_CFLAGS) \ # ifeq ($(OPENJDK_TARGET_OS), windows) # Statically link the C runtime so that there are not dependencies on modules # not on the search patch when invoked from the Windows system directory
*** 70,81 **** LDFLAGS_windows := -export:Agent_OnAttach, \ LIBS := $(JDKLIB_LIBS), \ LIBS_unix := -ljava $(LIBZ), \ LIBS_linux := -ljli $(LIBDL), \ LIBS_solaris := -ljli $(LIBDL), \ ! LIBS_aix := -liconv -ljli_static $(LIBDL), \ ! LIBS_macosx := -liconv -framework Cocoa -framework Security \ -framework ApplicationServices \ $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a, \ LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib \ $(SUPPORT_OUTPUTDIR)/native/java.base/jli_static.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ --- 71,82 ---- LDFLAGS_windows := -export:Agent_OnAttach, \ LIBS := $(JDKLIB_LIBS), \ LIBS_unix := -ljava $(LIBZ), \ LIBS_linux := -ljli $(LIBDL), \ LIBS_solaris := -ljli $(LIBDL), \ ! LIBS_aix := $(ICONV_LIBS) -ljli_static $(LIBDL), \ ! LIBS_macosx := $(ICONV_LIBS) -framework Cocoa -framework Security \ -framework ApplicationServices \ $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a, \ LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib \ $(SUPPORT_OUTPUTDIR)/native/java.base/jli_static.lib, \ VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
< prev index next >