archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-15 16:44:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8191204: Post-consolidation cleaning up of the build system

Browse source 
Reviewed-by: tbell, dholmes
This commit is contained in:
Magnus Ihse Bursie 2017-11-21 09:56:35 +01:00
parent dfaa92ca05
commit ec0c9e51ea
5 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/autoconf/configure vendored
View file

@ -90,13 +90,13 @@ check_autoconf_timestamps() {
check_hg_updates() { check_hg_updates() {
if test "x`which hg 2> /dev/null | grep -v '^no hg in'`" != x; then if test "x`which hg 2> /dev/null | grep -v '^no hg in'`" != x; then
conf_updated_autoconf_files=`cd $conf_script_dir && hg status -mard 2> /dev/null | grep autoconf` conf_updated_autoconf_files=`cd $conf_script_dir && hg status -mard . 2> /dev/null`
if test "x$conf_updated_autoconf_files" != x; then if test "x$conf_updated_autoconf_files" != x; then
echo "Configure source code has been updated, checking time stamps" echo "Configure source code has been updated, checking time stamps"
check_autoconf_timestamps check_autoconf_timestamps
elif test "x$CUSTOM_CONFIG_DIR" != x; then elif test "x$CUSTOM_CONFIG_DIR" != x; then
# If custom source configure is available, make sure it is up-to-date as well. # If custom source configure is available, make sure it is up-to-date as well.
conf_custom_updated_autoconf_files=`cd $CUSTOM_CONFIG_DIR && hg status -mard 2> /dev/null | grep autoconf` conf_custom_updated_autoconf_files=`cd $CUSTOM_CONFIG_DIR && hg status -mard . 2> /dev/null`
if test "x$conf_custom_updated_autoconf_files" != x; then if test "x$conf_custom_updated_autoconf_files" != x; then
echo "Configure custom source code has been updated, checking time stamps" echo "Configure custom source code has been updated, checking time stamps"
check_autoconf_timestamps check_autoconf_timestamps

3
make/autoconf/generated-configure.sh
View file

@ -1988,6 +1988,7 @@ Optional Features:
--enable-cds[=yes/no] enable class data sharing feature in non-minimal VM. --enable-cds[=yes/no] enable class data sharing feature in non-minimal VM.
Default is yes. Default is yes.
--disable-hotspot-gtest Disables building of the Hotspot unit tests --disable-hotspot-gtest Disables building of the Hotspot unit tests
[enabled]
--disable-freetype-bundling --disable-freetype-bundling
disable bundling of the freetype library with the disable bundling of the freetype library with the
build result [enabled on Windows or when using build result [enabled on Windows or when using
@ -5154,7 +5155,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=1511216793 DATE_WHEN_GENERATED=1511254554
############################################################################### ###############################################################################
# #

2
make/autoconf/hotspot.m4
View file

@ -476,7 +476,7 @@ AC_DEFUN([SETUP_HOTSPOT_TARGET_CPU_PORT],
AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_GTEST], AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_GTEST],
[ [
AC_ARG_ENABLE([hotspot-gtest], [AS_HELP_STRING([--disable-hotspot-gtest], AC_ARG_ENABLE([hotspot-gtest], [AS_HELP_STRING([--disable-hotspot-gtest],
[Disables building of the Hotspot unit tests])]) [Disables building of the Hotspot unit tests @<:@enabled@:>@])])
if test -e "${TOPDIR}/test/hotspot/gtest"; then if test -e "${TOPDIR}/test/hotspot/gtest"; then
GTEST_DIR_EXISTS="true" GTEST_DIR_EXISTS="true"

2
make/hotspot/lib/CompileJvm.gmk
View file

@ -112,7 +112,7 @@ JVM_LIBS += \
# #
# These files and directories are always excluded # These files and directories are always excluded
JVM_EXCLUDE_FILES += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp args.cc JVM_EXCLUDE_FILES += jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp args.cc
JVM_EXCLUDES += adlc JVM_EXCLUDES += adlc
# Needed by vm_version.cpp # Needed by vm_version.cpp

4
make/hotspot/lib/CompileLibjsig.gmk
View file

@ -81,7 +81,7 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
$(error Unknown target OS $(OPENJDK_TARGET_OS) in CompileLibjsig.gmk) $(error Unknown target OS $(OPENJDK_TARGET_OS) in CompileLibjsig.gmk)
endif endif
LIBJSIG_SRC_FILE := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjsig/jsig.c LIBJSIG_SRC_DIR := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjsig
LIBJSIG_MAPFILE := $(wildcard $(TOPDIR)/make/mapfiles/libjsig/mapfile-vers-$(OPENJDK_TARGET_OS)) LIBJSIG_MAPFILE := $(wildcard $(TOPDIR)/make/mapfiles/libjsig/mapfile-vers-$(OPENJDK_TARGET_OS))
LIBJSIG_OUTPUTDIR := $(HOTSPOT_OUTPUTDIR)/libjsig LIBJSIG_OUTPUTDIR := $(HOTSPOT_OUTPUTDIR)/libjsig
@ -91,7 +91,7 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
$(eval $(call SetupNativeCompilation, BUILD_LIBJSIG, \ $(eval $(call SetupNativeCompilation, BUILD_LIBJSIG, \
LIBRARY := jsig, \ LIBRARY := jsig, \
EXTRA_FILES := $(LIBJSIG_SRC_FILE), \ SRC := $(LIBJSIG_SRC_DIR), \
OUTPUT_DIR := $(LIB_OUTPUTDIR), \ OUTPUT_DIR := $(LIB_OUTPUTDIR), \
LANG := C, \ LANG := C, \
CFLAGS := $(LIBJSIG_CFLAGS) $(LIBJSIG_CPU_FLAGS), \ CFLAGS := $(LIBJSIG_CFLAGS) $(LIBJSIG_CPU_FLAGS), \