Merge
This commit is contained in:
commit
7189628683
@ -393,3 +393,4 @@ a22e2671d88f6b22a4aa82e3966986542ed2a381 jdk-9+146
|
|||||||
3ffc3e886c74736e387f3685e86b557cdea706c8 jdk-9+148
|
3ffc3e886c74736e387f3685e86b557cdea706c8 jdk-9+148
|
||||||
b119012d1c2ab2570fe8718633840d0c1f1f441d jdk-9+149
|
b119012d1c2ab2570fe8718633840d0c1f1f441d jdk-9+149
|
||||||
6234069ff9789f7582e1faa32cb6283cbd1a5a2d jdk-9+150
|
6234069ff9789f7582e1faa32cb6283cbd1a5a2d jdk-9+150
|
||||||
|
71a766d4c18041a7f833ee22823125b02e1a7f1e jdk-9+151
|
||||||
|
@ -147,15 +147,6 @@ AC_DEFUN_ONCE([FLAGS_SETUP_USER_SUPPLIED_FLAGS],
|
|||||||
EXTRA_CXXFLAGS="$with_extra_cxxflags"
|
EXTRA_CXXFLAGS="$with_extra_cxxflags"
|
||||||
EXTRA_LDFLAGS="$with_extra_ldflags"
|
EXTRA_LDFLAGS="$with_extra_ldflags"
|
||||||
|
|
||||||
# Hotspot needs these set in their legacy form
|
|
||||||
LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $EXTRA_CFLAGS"
|
|
||||||
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $EXTRA_CXXFLAGS"
|
|
||||||
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $EXTRA_LDFLAGS"
|
|
||||||
|
|
||||||
AC_SUBST(LEGACY_EXTRA_CFLAGS)
|
|
||||||
AC_SUBST(LEGACY_EXTRA_CXXFLAGS)
|
|
||||||
AC_SUBST(LEGACY_EXTRA_LDFLAGS)
|
|
||||||
|
|
||||||
AC_SUBST(EXTRA_CFLAGS)
|
AC_SUBST(EXTRA_CFLAGS)
|
||||||
AC_SUBST(EXTRA_CXXFLAGS)
|
AC_SUBST(EXTRA_CXXFLAGS)
|
||||||
AC_SUBST(EXTRA_LDFLAGS)
|
AC_SUBST(EXTRA_LDFLAGS)
|
||||||
@ -192,10 +183,6 @@ AC_DEFUN([FLAGS_SETUP_SYSROOT_FLAGS],
|
|||||||
$1SYSROOT_CFLAGS="-isysroot [$]$1SYSROOT"
|
$1SYSROOT_CFLAGS="-isysroot [$]$1SYSROOT"
|
||||||
$1SYSROOT_LDFLAGS="-isysroot [$]$1SYSROOT"
|
$1SYSROOT_LDFLAGS="-isysroot [$]$1SYSROOT"
|
||||||
fi
|
fi
|
||||||
# Propagate the sysroot args to hotspot
|
|
||||||
$1LEGACY_EXTRA_CFLAGS="[$]$1LEGACY_EXTRA_CFLAGS [$]$1SYSROOT_CFLAGS"
|
|
||||||
$1LEGACY_EXTRA_CXXFLAGS="[$]$1LEGACY_EXTRA_CXXFLAGS [$]$1SYSROOT_CFLAGS"
|
|
||||||
$1LEGACY_EXTRA_LDFLAGS="[$]$1LEGACY_EXTRA_LDFLAGS [$]$1SYSROOT_LDFLAGS"
|
|
||||||
# The global CFLAGS and LDFLAGS variables need these for configure to function
|
# The global CFLAGS and LDFLAGS variables need these for configure to function
|
||||||
$1CFLAGS="[$]$1CFLAGS [$]$1SYSROOT_CFLAGS"
|
$1CFLAGS="[$]$1CFLAGS [$]$1SYSROOT_CFLAGS"
|
||||||
$1CPPFLAGS="[$]$1CPPFLAGS [$]$1SYSROOT_CFLAGS"
|
$1CPPFLAGS="[$]$1CPPFLAGS [$]$1SYSROOT_CFLAGS"
|
||||||
|
@ -854,9 +854,6 @@ SYSROOT_CFLAGS
|
|||||||
EXTRA_LDFLAGS
|
EXTRA_LDFLAGS
|
||||||
EXTRA_CXXFLAGS
|
EXTRA_CXXFLAGS
|
||||||
EXTRA_CFLAGS
|
EXTRA_CFLAGS
|
||||||
LEGACY_EXTRA_LDFLAGS
|
|
||||||
LEGACY_EXTRA_CXXFLAGS
|
|
||||||
LEGACY_EXTRA_CFLAGS
|
|
||||||
EXE_SUFFIX
|
EXE_SUFFIX
|
||||||
OBJ_SUFFIX
|
OBJ_SUFFIX
|
||||||
STATIC_LIBRARY
|
STATIC_LIBRARY
|
||||||
@ -5170,7 +5167,7 @@ VS_SDK_PLATFORM_NAME_2013=
|
|||||||
#CUSTOM_AUTOCONF_INCLUDE
|
#CUSTOM_AUTOCONF_INCLUDE
|
||||||
|
|
||||||
# Do not change or remove the following line, it is needed for consistency checks:
|
# Do not change or remove the following line, it is needed for consistency checks:
|
||||||
DATE_WHEN_GENERATED=1482828098
|
DATE_WHEN_GENERATED=1483542685
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
#
|
#
|
||||||
@ -31290,8 +31287,6 @@ $as_echo "yes" >&6; }
|
|||||||
as_fn_error $? "--enable-static-build is only supported for macosx builds" "$LINENO" 5
|
as_fn_error $? "--enable-static-build is only supported for macosx builds" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
STATIC_BUILD_CFLAGS="-DSTATIC_BUILD=1"
|
STATIC_BUILD_CFLAGS="-DSTATIC_BUILD=1"
|
||||||
LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $STATIC_BUILD_CFLAGS"
|
|
||||||
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $STATIC_BUILD_CFLAGS"
|
|
||||||
CFLAGS_JDKLIB_EXTRA="$CFLAGS_JDKLIB_EXTRA $STATIC_BUILD_CFLAGS"
|
CFLAGS_JDKLIB_EXTRA="$CFLAGS_JDKLIB_EXTRA $STATIC_BUILD_CFLAGS"
|
||||||
CXXFLAGS_JDKLIB_EXTRA="$CXXFLAGS_JDKLIB_EXTRA $STATIC_BUILD_CFLAGS"
|
CXXFLAGS_JDKLIB_EXTRA="$CXXFLAGS_JDKLIB_EXTRA $STATIC_BUILD_CFLAGS"
|
||||||
STATIC_BUILD=true
|
STATIC_BUILD=true
|
||||||
@ -31493,15 +31488,6 @@ fi
|
|||||||
EXTRA_CXXFLAGS="$with_extra_cxxflags"
|
EXTRA_CXXFLAGS="$with_extra_cxxflags"
|
||||||
EXTRA_LDFLAGS="$with_extra_ldflags"
|
EXTRA_LDFLAGS="$with_extra_ldflags"
|
||||||
|
|
||||||
# Hotspot needs these set in their legacy form
|
|
||||||
LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $EXTRA_CFLAGS"
|
|
||||||
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $EXTRA_CXXFLAGS"
|
|
||||||
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $EXTRA_LDFLAGS"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -31533,10 +31519,6 @@ fi
|
|||||||
SYSROOT_CFLAGS="-isysroot $SYSROOT"
|
SYSROOT_CFLAGS="-isysroot $SYSROOT"
|
||||||
SYSROOT_LDFLAGS="-isysroot $SYSROOT"
|
SYSROOT_LDFLAGS="-isysroot $SYSROOT"
|
||||||
fi
|
fi
|
||||||
# Propagate the sysroot args to hotspot
|
|
||||||
LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $SYSROOT_CFLAGS"
|
|
||||||
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $SYSROOT_CFLAGS"
|
|
||||||
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS"
|
|
||||||
# The global CFLAGS and LDFLAGS variables need these for configure to function
|
# The global CFLAGS and LDFLAGS variables need these for configure to function
|
||||||
CFLAGS="$CFLAGS $SYSROOT_CFLAGS"
|
CFLAGS="$CFLAGS $SYSROOT_CFLAGS"
|
||||||
CPPFLAGS="$CPPFLAGS $SYSROOT_CFLAGS"
|
CPPFLAGS="$CPPFLAGS $SYSROOT_CFLAGS"
|
||||||
@ -44053,10 +44035,6 @@ $as_echo "$BUILD_DEVKIT_ROOT" >&6; }
|
|||||||
BUILD_SYSROOT_CFLAGS="-isysroot $BUILD_SYSROOT"
|
BUILD_SYSROOT_CFLAGS="-isysroot $BUILD_SYSROOT"
|
||||||
BUILD_SYSROOT_LDFLAGS="-isysroot $BUILD_SYSROOT"
|
BUILD_SYSROOT_LDFLAGS="-isysroot $BUILD_SYSROOT"
|
||||||
fi
|
fi
|
||||||
# Propagate the sysroot args to hotspot
|
|
||||||
BUILD_LEGACY_EXTRA_CFLAGS="$BUILD_LEGACY_EXTRA_CFLAGS $BUILD_SYSROOT_CFLAGS"
|
|
||||||
BUILD_LEGACY_EXTRA_CXXFLAGS="$BUILD_LEGACY_EXTRA_CXXFLAGS $BUILD_SYSROOT_CFLAGS"
|
|
||||||
BUILD_LEGACY_EXTRA_LDFLAGS="$BUILD_LEGACY_EXTRA_LDFLAGS $BUILD_SYSROOT_LDFLAGS"
|
|
||||||
# The global CFLAGS and LDFLAGS variables need these for configure to function
|
# The global CFLAGS and LDFLAGS variables need these for configure to function
|
||||||
BUILD_CFLAGS="$BUILD_CFLAGS $BUILD_SYSROOT_CFLAGS"
|
BUILD_CFLAGS="$BUILD_CFLAGS $BUILD_SYSROOT_CFLAGS"
|
||||||
BUILD_CPPFLAGS="$BUILD_CPPFLAGS $BUILD_SYSROOT_CFLAGS"
|
BUILD_CPPFLAGS="$BUILD_CPPFLAGS $BUILD_SYSROOT_CFLAGS"
|
||||||
@ -52779,9 +52757,8 @@ $as_echo_n "checking if native coverage is enabled... " >&6; }
|
|||||||
$as_echo "yes" >&6; }
|
$as_echo "yes" >&6; }
|
||||||
GCOV_CFLAGS="-fprofile-arcs -ftest-coverage -fno-inline"
|
GCOV_CFLAGS="-fprofile-arcs -ftest-coverage -fno-inline"
|
||||||
GCOV_LDFLAGS="-fprofile-arcs"
|
GCOV_LDFLAGS="-fprofile-arcs"
|
||||||
LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $GCOV_CFLAGS"
|
JVM_CFLAGS="$JVM_CFLAGS $GCOV_CFLAGS"
|
||||||
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $GCOV_CFLAGS"
|
JVM_LDFLAGS="$JVM_LDFLAGS $GCOV_LDFLAGS"
|
||||||
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $GCOV_LDFLAGS"
|
|
||||||
CFLAGS_JDKLIB="$CFLAGS_JDKLIB $GCOV_CFLAGS"
|
CFLAGS_JDKLIB="$CFLAGS_JDKLIB $GCOV_CFLAGS"
|
||||||
CFLAGS_JDKEXE="$CFLAGS_JDKEXE $GCOV_CFLAGS"
|
CFLAGS_JDKEXE="$CFLAGS_JDKEXE $GCOV_CFLAGS"
|
||||||
CXXFLAGS_JDKLIB="$CXXFLAGS_JDKLIB $GCOV_CFLAGS"
|
CXXFLAGS_JDKLIB="$CXXFLAGS_JDKLIB $GCOV_CFLAGS"
|
||||||
@ -52982,7 +52959,7 @@ $as_echo "yes, forced" >&6; }
|
|||||||
$as_echo "no, forced" >&6; }
|
$as_echo "no, forced" >&6; }
|
||||||
BUILD_GTEST="false"
|
BUILD_GTEST="false"
|
||||||
elif test "x$enable_hotspot_gtest" = "x"; then
|
elif test "x$enable_hotspot_gtest" = "x"; then
|
||||||
if test "x$GTEST_DIR_EXISTS" = "xtrue" && test "x$OPENJDK_TARGET_OS" != "xaix"; then
|
if test "x$GTEST_DIR_EXISTS" = "xtrue"; then
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||||
$as_echo "yes" >&6; }
|
$as_echo "yes" >&6; }
|
||||||
BUILD_GTEST="true"
|
BUILD_GTEST="true"
|
||||||
|
@ -320,9 +320,8 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_CODE_COVERAGE],
|
|||||||
AC_MSG_RESULT([yes])
|
AC_MSG_RESULT([yes])
|
||||||
GCOV_CFLAGS="-fprofile-arcs -ftest-coverage -fno-inline"
|
GCOV_CFLAGS="-fprofile-arcs -ftest-coverage -fno-inline"
|
||||||
GCOV_LDFLAGS="-fprofile-arcs"
|
GCOV_LDFLAGS="-fprofile-arcs"
|
||||||
LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $GCOV_CFLAGS"
|
JVM_CFLAGS="$JVM_CFLAGS $GCOV_CFLAGS"
|
||||||
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $GCOV_CFLAGS"
|
JVM_LDFLAGS="$JVM_LDFLAGS $GCOV_LDFLAGS"
|
||||||
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $GCOV_LDFLAGS"
|
|
||||||
CFLAGS_JDKLIB="$CFLAGS_JDKLIB $GCOV_CFLAGS"
|
CFLAGS_JDKLIB="$CFLAGS_JDKLIB $GCOV_CFLAGS"
|
||||||
CFLAGS_JDKEXE="$CFLAGS_JDKEXE $GCOV_CFLAGS"
|
CFLAGS_JDKEXE="$CFLAGS_JDKEXE $GCOV_CFLAGS"
|
||||||
CXXFLAGS_JDKLIB="$CXXFLAGS_JDKLIB $GCOV_CFLAGS"
|
CXXFLAGS_JDKLIB="$CXXFLAGS_JDKLIB $GCOV_CFLAGS"
|
||||||
@ -360,8 +359,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_STATIC_BUILD],
|
|||||||
AC_MSG_ERROR([--enable-static-build is only supported for macosx builds])
|
AC_MSG_ERROR([--enable-static-build is only supported for macosx builds])
|
||||||
fi
|
fi
|
||||||
STATIC_BUILD_CFLAGS="-DSTATIC_BUILD=1"
|
STATIC_BUILD_CFLAGS="-DSTATIC_BUILD=1"
|
||||||
LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $STATIC_BUILD_CFLAGS"
|
|
||||||
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $STATIC_BUILD_CFLAGS"
|
|
||||||
CFLAGS_JDKLIB_EXTRA="$CFLAGS_JDKLIB_EXTRA $STATIC_BUILD_CFLAGS"
|
CFLAGS_JDKLIB_EXTRA="$CFLAGS_JDKLIB_EXTRA $STATIC_BUILD_CFLAGS"
|
||||||
CXXFLAGS_JDKLIB_EXTRA="$CXXFLAGS_JDKLIB_EXTRA $STATIC_BUILD_CFLAGS"
|
CXXFLAGS_JDKLIB_EXTRA="$CXXFLAGS_JDKLIB_EXTRA $STATIC_BUILD_CFLAGS"
|
||||||
STATIC_BUILD=true
|
STATIC_BUILD=true
|
||||||
|
@ -263,6 +263,7 @@ var getJibProfilesCommon = function (input, data) {
|
|||||||
labels: "open"
|
labels: "open"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
common.configure_args_64bit = ["--with-target-bits=64"];
|
||||||
common.configure_args_32bit = ["--with-target-bits=32"];
|
common.configure_args_32bit = ["--with-target-bits=32"];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -419,7 +420,7 @@ var getJibProfilesProfiles = function (input, common, data) {
|
|||||||
target_os: "linux",
|
target_os: "linux",
|
||||||
target_cpu: "x64",
|
target_cpu: "x64",
|
||||||
dependencies: ["devkit"],
|
dependencies: ["devkit"],
|
||||||
configure_args: ["--with-zlib=system"],
|
configure_args: concat(common.configure_args_64bit, "--with-zlib=system"),
|
||||||
default_make_targets: ["docs-bundles"],
|
default_make_targets: ["docs-bundles"],
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -436,27 +437,30 @@ var getJibProfilesProfiles = function (input, common, data) {
|
|||||||
target_os: "macosx",
|
target_os: "macosx",
|
||||||
target_cpu: "x64",
|
target_cpu: "x64",
|
||||||
dependencies: ["devkit"],
|
dependencies: ["devkit"],
|
||||||
configure_args: concat(common.configure_args, "--with-zlib=system"),
|
configure_args: concat(common.configure_args_64bit, "--with-zlib=system"),
|
||||||
},
|
},
|
||||||
|
|
||||||
"solaris-x64": {
|
"solaris-x64": {
|
||||||
target_os: "solaris",
|
target_os: "solaris",
|
||||||
target_cpu: "x64",
|
target_cpu: "x64",
|
||||||
dependencies: ["devkit", "cups"],
|
dependencies: ["devkit", "cups"],
|
||||||
configure_args: ["--with-zlib=system", "--enable-dtrace"],
|
configure_args: concat(common.configure_args_64bit,
|
||||||
|
"--with-zlib=system", "--enable-dtrace"),
|
||||||
},
|
},
|
||||||
|
|
||||||
"solaris-sparcv9": {
|
"solaris-sparcv9": {
|
||||||
target_os: "solaris",
|
target_os: "solaris",
|
||||||
target_cpu: "sparcv9",
|
target_cpu: "sparcv9",
|
||||||
dependencies: ["devkit", "cups"],
|
dependencies: ["devkit", "cups"],
|
||||||
configure_args: ["--with-zlib=system", "--enable-dtrace"],
|
configure_args: concat(common.configure_args_64bit,
|
||||||
|
"--with-zlib=system", "--enable-dtrace"),
|
||||||
},
|
},
|
||||||
|
|
||||||
"windows-x64": {
|
"windows-x64": {
|
||||||
target_os: "windows",
|
target_os: "windows",
|
||||||
target_cpu: "x64",
|
target_cpu: "x64",
|
||||||
dependencies: ["devkit", "freetype"],
|
dependencies: ["devkit", "freetype"],
|
||||||
|
configure_args: concat(common.configure_args_64bit),
|
||||||
},
|
},
|
||||||
|
|
||||||
"windows-x86": {
|
"windows-x86": {
|
||||||
@ -518,11 +522,11 @@ var getJibProfilesProfiles = function (input, common, data) {
|
|||||||
target_os: "linux",
|
target_os: "linux",
|
||||||
target_cpu: "x64",
|
target_cpu: "x64",
|
||||||
dependencies: ["devkit"],
|
dependencies: ["devkit"],
|
||||||
configure_args: [
|
configure_args: concat(common.configure_args_64bit, [
|
||||||
"--with-zlib=system",
|
"--with-zlib=system",
|
||||||
"--with-jvm-variants=zero",
|
"--with-jvm-variants=zero",
|
||||||
"--enable-libffi-bundling"
|
"--enable-libffi-bundling"
|
||||||
]
|
])
|
||||||
},
|
},
|
||||||
|
|
||||||
"linux-x86-zero": {
|
"linux-x86-zero": {
|
||||||
|
@ -67,14 +67,17 @@ ifneq ($(LIBS_DIR), )
|
|||||||
# or risk invalidating the build output from external changes.
|
# or risk invalidating the build output from external changes.
|
||||||
ifeq ($(filter $(OUTPUT_ROOT)/%, $(LIBS_DIR)), )
|
ifeq ($(filter $(OUTPUT_ROOT)/%, $(LIBS_DIR)), )
|
||||||
LINK_MACRO := install-file
|
LINK_MACRO := install-file
|
||||||
|
LOG_ACTION := Copying
|
||||||
else
|
else
|
||||||
LINK_MACRO := link-file-relative
|
LINK_MACRO := link-file-relative
|
||||||
|
LOG_ACTION := Creating symlink
|
||||||
endif
|
endif
|
||||||
$(eval $(call SetupCopyFiles, LINK_LIBS, \
|
$(eval $(call SetupCopyFiles, LINK_LIBS, \
|
||||||
SRC := $(LIBS_DIR), \
|
SRC := $(LIBS_DIR), \
|
||||||
DEST := $(JDK_OUTPUTDIR)/lib, \
|
DEST := $(JDK_OUTPUTDIR)/lib, \
|
||||||
FILES := $(filter-out %$(SHARED_LIBRARY_SUFFIX), $(call CacheFind, $(LIBS_DIR))), \
|
FILES := $(filter-out %$(SHARED_LIBRARY_SUFFIX), $(call CacheFind, $(LIBS_DIR))), \
|
||||||
MACRO := $(LINK_MACRO), \
|
MACRO := $(LINK_MACRO), \
|
||||||
|
LOG_ACTION := $(LOG_ACTION), \
|
||||||
))
|
))
|
||||||
TARGETS += $(COPY_LIBS) $(LINK_LIBS)
|
TARGETS += $(COPY_LIBS) $(LINK_LIBS)
|
||||||
endif
|
endif
|
||||||
|
@ -630,13 +630,12 @@ else
|
|||||||
# in javadoc.
|
# in javadoc.
|
||||||
java.desktop-gensrc-jdk: java.base-gensrc
|
java.desktop-gensrc-jdk: java.base-gensrc
|
||||||
|
|
||||||
# The annotation processing for jdk.vm.ci needs java.base classes from the
|
# The annotation processing for jdk.vm.ci and jdk.vm.compiler needs classes
|
||||||
# current JDK.
|
# from the current JDK.
|
||||||
jdk.vm.ci-gensrc-hotspot: java.base-java
|
jdk.vm.ci-gensrc-hotspot: $(addsuffix -java, \
|
||||||
|
$(call FindTransitiveDepsForModule, jdk.vm.ci))
|
||||||
# The annotation processing for jdk.vm.compiler needs classes from the current JDK.
|
jdk.vm.compiler-gensrc-hotspot: $(addsuffix -java, \
|
||||||
jdk.vm.compiler-gensrc-hotspot: java.base-java java.management-java \
|
$(call FindTransitiveDepsForModule, jdk.vm.compiler))
|
||||||
jdk.management-java jdk.vm.ci-java jdk.unsupported-java
|
|
||||||
|
|
||||||
# For jdk.vm.compiler, the gensrc step is generating a module-info.java.extra
|
# For jdk.vm.compiler, the gensrc step is generating a module-info.java.extra
|
||||||
# file to be processed by the gensrc-moduleinfo target.
|
# file to be processed by the gensrc-moduleinfo target.
|
||||||
|
@ -76,6 +76,7 @@ else
|
|||||||
$(filter $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/%, \
|
$(filter $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/%, \
|
||||||
$(TARGETS))), \
|
$(TARGETS))), \
|
||||||
MACRO := link-file-relative, \
|
MACRO := link-file-relative, \
|
||||||
|
LOG_ACTION := Creating symlink, \
|
||||||
))
|
))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -694,8 +694,9 @@ define AddFileToCopy
|
|||||||
# 2 : Dest file
|
# 2 : Dest file
|
||||||
# 3 : Variable to add targets to
|
# 3 : Variable to add targets to
|
||||||
# 4 : Macro to call for copy operation
|
# 4 : Macro to call for copy operation
|
||||||
|
# 5 : Action text to log
|
||||||
$2: $1
|
$2: $1
|
||||||
$$(call LogInfo, Copying $$(patsubst $(OUTPUT_ROOT)/%,%,$$@))
|
$$(call LogInfo, $(strip $5) $$(patsubst $(OUTPUT_ROOT)/%,%,$$@))
|
||||||
$$($$(strip $4))
|
$$($$(strip $4))
|
||||||
|
|
||||||
$3 += $2
|
$3 += $2
|
||||||
@ -721,6 +722,7 @@ identity = \
|
|||||||
# Default is 'install-file'
|
# Default is 'install-file'
|
||||||
# NAME_MACRO : Optionally supply a macro that rewrites the target file name
|
# NAME_MACRO : Optionally supply a macro that rewrites the target file name
|
||||||
# based on the source file name
|
# based on the source file name
|
||||||
|
# LOG_ACTION : Optionally specify a different action text for log messages
|
||||||
SetupCopyFiles = $(NamedParamsMacroTemplate)
|
SetupCopyFiles = $(NamedParamsMacroTemplate)
|
||||||
define SetupCopyFilesBody
|
define SetupCopyFilesBody
|
||||||
|
|
||||||
@ -737,6 +739,10 @@ define SetupCopyFilesBody
|
|||||||
$1_NAME_MACRO := identity
|
$1_NAME_MACRO := identity
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($$($1_LOG_ACTION), )
|
||||||
|
$1_LOG_ACTION := Copying
|
||||||
|
endif
|
||||||
|
|
||||||
# Remove any trailing slash from SRC and DEST
|
# Remove any trailing slash from SRC and DEST
|
||||||
$1_SRC := $$(patsubst %/,%,$$($1_SRC))
|
$1_SRC := $$(patsubst %/,%,$$($1_SRC))
|
||||||
$1_DEST := $$(patsubst %/,%,$$($1_DEST))
|
$1_DEST := $$(patsubst %/,%,$$($1_DEST))
|
||||||
@ -744,7 +750,7 @@ define SetupCopyFilesBody
|
|||||||
$$(foreach f, $$(patsubst $$($1_SRC)/%,%,$$($1_FILES)), \
|
$$(foreach f, $$(patsubst $$($1_SRC)/%,%,$$($1_FILES)), \
|
||||||
$$(eval $$(call AddFileToCopy, $$($1_SRC)/$$f, \
|
$$(eval $$(call AddFileToCopy, $$($1_SRC)/$$f, \
|
||||||
$$($1_DEST)/$$(call $$(strip $$($1_NAME_MACRO)),$$(if $$($1_FLATTEN),$$(notdir $$f),$$f)), \
|
$$($1_DEST)/$$(call $$(strip $$($1_NAME_MACRO)),$$(if $$($1_FLATTEN),$$(notdir $$f),$$f)), \
|
||||||
$1, $$($1_MACRO))))
|
$1, $$($1_MACRO), $$($1_LOG_ACTION))))
|
||||||
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user