8217739: Cannot reuse java.base UnixConstants.java from target in BuildJDK when cross compiling
Reviewed-by: tbell, aoqi
This commit is contained in:
Erik Joelsson
parent
0bf2650bb1
commit
f28e32dbe3
@ -1,79 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2015, 2019, 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
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
default: all
|
||||
|
||||
include $(SPEC)
|
||||
include MakeBase.gmk
|
||||
include Modules.gmk
|
||||
|
||||
MODULES_TO_COPY := $(sort \
|
||||
$(foreach m, jdk.jlink $(INTERIM_IMAGE_MODULES), \
|
||||
$(call FindTransitiveDepsForModule, $m) $m))
|
||||
|
||||
################################################################################
|
||||
# Copy the modules needed to run jlink and jmod. Use bulk copy instead of
|
||||
# SetupCopyFiles since there are so many files.
|
||||
|
||||
COPY_CLASSES_TARGET := $(BUILDJDK_OUTPUTDIR)/jdk/modules/java.base/_the.buildjdk-copy-marker
|
||||
|
||||
$(COPY_CLASSES_TARGET): $(call FindFiles, $(wildcard \
|
||||
$(addprefix $(JDK_OUTPUTDIR)/modules/, $(MODULES_TO_COPY))))
|
||||
$(call LogInfo, Copying java modules to buildjdk: $(MODULES_TO_COPY))
|
||||
$(RM) -r $(BUILDJDK_OUTPUTDIR)/jdk/modules
|
||||
$(MKDIR) -p $(BUILDJDK_OUTPUTDIR)/jdk/modules
|
||||
$(foreach m, $(MODULES_TO_COPY), \
|
||||
$(CP) -R $(JDK_OUTPUTDIR)/modules/$m \
|
||||
$(BUILDJDK_OUTPUTDIR)/jdk/modules/ $(NEWLINE))
|
||||
$(TOUCH) $@
|
||||
|
||||
TARGETS += $(COPY_CLASSES_TARGET)
|
||||
|
||||
################################################################################
|
||||
|
||||
$(eval $(call SetupCopyFiles, COPY_SUPPORT_HEADERS, \
|
||||
SRC := $(OUTPUTDIR), \
|
||||
DEST := $(BUILDJDK_OUTPUTDIR), \
|
||||
FILES := $(call FindFiles, $(wildcard \
|
||||
$(addprefix $(SUPPORT_OUTPUTDIR)/headers/, $(MODULES_TO_COPY)))), \
|
||||
))
|
||||
|
||||
TARGETS += $(COPY_SUPPORT_HEADERS)
|
||||
|
||||
################################################################################
|
||||
|
||||
$(eval $(call SetupCopyFiles, COPY_JDK_LIB_FILES, \
|
||||
SRC := $(OUTPUTDIR), \
|
||||
DEST := $(BUILDJDK_OUTPUTDIR), \
|
||||
FILES := $(JDK_OUTPUTDIR)/lib/tzdb.dat, \
|
||||
))
|
||||
|
||||
TARGETS += $(COPY_JDK_LIB_FILES)
|
||||
|
||||
################################################################################
|
||||
|
||||
all: $(TARGETS)
|
||||
|
||||
.PHONY: default all
|
||||
@ -37,7 +37,7 @@ include $(TOPDIR)/make/ModuleTools.gmk
|
||||
ALL_MODULEINFO_CLASSES := $(wildcard $(JDK_OUTPUTDIR)/modules/*/module-info.class)
|
||||
|
||||
$(eval $(call SetupExecute, optimize_image, \
|
||||
INFO := Optimizing the exploded image, \
|
||||
WARN := Optimizing the exploded image, \
|
||||
DEPS := $(ALL_MODULEINFO_CLASSES) $(BUILD_JIGSAW_CLASSES), \
|
||||
OUTPUT_DIR := $(JDK_OUTPUTDIR), \
|
||||
COMMAND := $(TOOL_ADD_PACKAGES_ATTRIBUTE) $(JDK_OUTPUTDIR), \
|
||||
|
||||
116
make/Main.gmk
116
make/Main.gmk
@ -66,30 +66,26 @@ ALL_MODULES := $(call FindAllModules)
|
||||
################################################################################
|
||||
# Interim/build tools targets, compiling tools used during the build
|
||||
|
||||
# When creating a BUILDJDK, the buildtools and interim targets have already
|
||||
# been built and should not be built again.
|
||||
ifneq ($(CREATING_BUILDJDK), true)
|
||||
buildtools-langtools:
|
||||
buildtools-langtools:
|
||||
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ToolsLangtools.gmk)
|
||||
|
||||
interim-langtools:
|
||||
interim-langtools:
|
||||
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimLangtools.gmk)
|
||||
|
||||
interim-rmic:
|
||||
interim-rmic:
|
||||
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
|
||||
|
||||
interim-cldrconverter:
|
||||
interim-cldrconverter:
|
||||
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
|
||||
|
||||
buildtools-jdk:
|
||||
buildtools-jdk:
|
||||
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsJdk.gmk)
|
||||
|
||||
buildtools-modules:
|
||||
buildtools-modules:
|
||||
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileModuleTools.gmk)
|
||||
|
||||
buildtools-hotspot:
|
||||
buildtools-hotspot:
|
||||
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsHotspot.gmk)
|
||||
endif
|
||||
|
||||
ALL_TARGETS += buildtools-langtools interim-langtools \
|
||||
interim-rmic interim-cldrconverter buildtools-jdk buildtools-modules \
|
||||
@ -106,43 +102,39 @@ ALL_TARGETS += generate-exported-symbols
|
||||
################################################################################
|
||||
# Gensrc targets, generating source before java compilation can be done
|
||||
#
|
||||
# When creating a BUILDJDK, the java targets have already been built and copied
|
||||
# into the buildjdk so no need to generate sources.
|
||||
ifneq ($(CREATING_BUILDJDK), true)
|
||||
$(eval $(call DeclareRecipesForPhase, GENSRC, \
|
||||
$(eval $(call DeclareRecipesForPhase, GENSRC, \
|
||||
TARGET_SUFFIX := gensrc-src, \
|
||||
FILE_PREFIX := Gensrc, \
|
||||
MAKE_SUBDIR := gensrc, \
|
||||
CHECK_MODULES := $(ALL_MODULES), \
|
||||
))
|
||||
))
|
||||
|
||||
$(foreach m, $(GENSRC_MODULES), $(eval $m-gensrc: $m-gensrc-src))
|
||||
$(foreach m, $(GENSRC_MODULES), $(eval $m-gensrc: $m-gensrc-src))
|
||||
|
||||
LANGTOOLS_GENSRC_TARGETS := $(filter $(addsuffix -%, $(LANGTOOLS_MODULES)), $(GENSRC_TARGETS))
|
||||
INTERIM_LANGTOOLS_GENSRC_TARGETS := $(filter $(addsuffix -%, \
|
||||
LANGTOOLS_GENSRC_TARGETS := $(filter $(addsuffix -%, $(LANGTOOLS_MODULES)), $(GENSRC_TARGETS))
|
||||
INTERIM_LANGTOOLS_GENSRC_TARGETS := $(filter $(addsuffix -%, \
|
||||
$(INTERIM_LANGTOOLS_BASE_MODULES)), $(GENSRC_TARGETS))
|
||||
HOTSPOT_GENSRC_TARGETS := $(filter $(addsuffix -%, $(HOTSPOT_MODULES)), $(GENSRC_TARGETS))
|
||||
JDK_GENSRC_TARGETS := $(filter-out $(LANGTOOLS_GENSRC_TARGETS) \
|
||||
HOTSPOT_GENSRC_TARGETS := $(filter $(addsuffix -%, $(HOTSPOT_MODULES)), $(GENSRC_TARGETS))
|
||||
JDK_GENSRC_TARGETS := $(filter-out $(LANGTOOLS_GENSRC_TARGETS) \
|
||||
$(HOTSPOT_GENSRC_TARGETS), $(GENSRC_TARGETS))
|
||||
|
||||
GENSRC_MODULEINFO_MODULES := $(ALL_MODULES)
|
||||
GENSRC_MODULEINFO_TARGETS := $(addsuffix -gensrc-moduleinfo, \
|
||||
GENSRC_MODULEINFO_MODULES := $(ALL_MODULES)
|
||||
GENSRC_MODULEINFO_TARGETS := $(addsuffix -gensrc-moduleinfo, \
|
||||
$(GENSRC_MODULEINFO_MODULES))
|
||||
|
||||
GENSRC_MODULES := $(GENSRC_MODULEINFO_MODULES)
|
||||
GENSRC_TARGETS += $(sort $(GENSRC_MODULEINFO_TARGETS) \
|
||||
GENSRC_MODULES := $(GENSRC_MODULEINFO_MODULES)
|
||||
GENSRC_TARGETS += $(sort $(GENSRC_MODULEINFO_TARGETS) \
|
||||
$(addsuffix -gensrc, $(GENSRC_MODULES)))
|
||||
|
||||
define DeclareModuleInfoRecipe
|
||||
define DeclareModuleInfoRecipe
|
||||
$1-gensrc-moduleinfo:
|
||||
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
|
||||
-f GensrcModuleInfo.gmk MODULE=$1)
|
||||
|
||||
$1-gensrc: $1-gensrc-moduleinfo
|
||||
endef
|
||||
endef
|
||||
|
||||
$(foreach m, $(GENSRC_MODULEINFO_MODULES), $(eval $(call DeclareModuleInfoRecipe,$m)))
|
||||
endif
|
||||
$(foreach m, $(GENSRC_MODULEINFO_MODULES), $(eval $(call DeclareModuleInfoRecipe,$m)))
|
||||
|
||||
ALL_TARGETS += $(GENSRC_TARGETS)
|
||||
|
||||
@ -358,7 +350,7 @@ bootcycle-images:
|
||||
$(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
|
||||
$(call MakeDir, $(OUTPUTDIR)/bootcycle-build)
|
||||
+$(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
|
||||
JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
|
||||
LOG_PREFIX="[bootcycle] " JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
|
||||
else
|
||||
$(call LogWarn, Boot cycle build disabled when cross compiling)
|
||||
endif
|
||||
@ -455,15 +447,18 @@ ifeq ($(CREATING_BUILDJDK), true)
|
||||
java.base-copy jdk.jdeps-launchers
|
||||
endif
|
||||
|
||||
create-buildjdk-copy:
|
||||
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateBuildJdkCopy.gmk)
|
||||
BUILDJDK_MODULES := $(sort $(foreach m, jdk.jlink $(INTERIM_IMAGE_MODULES), \
|
||||
$(call FindTransitiveDepsForModule, $m) $m))
|
||||
|
||||
create-buildjdk-interim-image:
|
||||
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Main.gmk \
|
||||
$@-helper \
|
||||
SPEC=$(dir $(SPEC))buildjdk-spec.gmk \
|
||||
HOTSPOT_SPEC=$(dir $(SPEC))buildjdk-spec.gmk \
|
||||
CREATING_BUILDJDK=true)
|
||||
CREATING_BUILDJDK=true \
|
||||
LOG_PREFIX="[buildjdk] " \
|
||||
JAVA_MODULES="$(BUILDJDK_MODULES)" \
|
||||
)
|
||||
|
||||
ALL_TARGETS += create-buildjdk-copy create-buildjdk-interim-image
|
||||
|
||||
@ -695,7 +690,7 @@ else
|
||||
# The demos are currently linking to libjvm and libjava, just like all other
|
||||
# jdk libs, even though they don't need to. To avoid warnings, make sure they
|
||||
# aren't built until after libjava and libjvm are available to link to.
|
||||
demos-jdk: java.base-libs exploded-image-optimize
|
||||
demos-jdk: java.base-libs exploded-image
|
||||
test-image-demos-jdk: demos-jdk
|
||||
|
||||
# Declare dependency from <module>-java to <module>-gensrc
|
||||
@ -711,11 +706,7 @@ else
|
||||
|
||||
# Declare dependencies from <module>-lib to <module>-java
|
||||
# Skip modules that do not have java source.
|
||||
# When creating a BUILDJDK, the java compilation has already been done by the
|
||||
# normal build and copied in.
|
||||
ifneq ($(CREATING_BUILDJDK), true)
|
||||
$(foreach m, $(filter $(JAVA_MODULES), $(LIBS_MODULES)), $(eval $m-libs: $m-java))
|
||||
endif
|
||||
|
||||
# Declare dependencies from all other <module>-lib to java.base-lib
|
||||
$(foreach t, $(filter-out java.base-libs, $(LIBS_TARGETS)), \
|
||||
@ -753,7 +744,7 @@ else
|
||||
|
||||
# Declare dependencies between jmod targets.
|
||||
# java.base jmod needs jrt-fs.jar and access to the other jmods to be built.
|
||||
# When creating a BUILDJDK, we don't need to add hashes to java.base, thus
|
||||
# When creating the BUILDJDK, we don't need to add hashes to java.base, thus
|
||||
# we don't need to depend on all other jmods
|
||||
ifneq ($(CREATING_BUILDJDK), true)
|
||||
java.base-jmod: jrtfs-jar $(filter-out java.base-jmod, $(JMOD_TARGETS))
|
||||
@ -766,11 +757,7 @@ else
|
||||
java.base-jmod: $(JVM_MAIN_TARGETS)
|
||||
|
||||
# Declare dependencies from <module>-jmod to all other module targets
|
||||
# When creating a BUILDJDK, the java compilation has already been done by the
|
||||
# normal build and copied in.
|
||||
ifneq ($(CREATING_BUILDJDK), true)
|
||||
$(foreach m, $(JAVA_MODULES), $(eval $m_JMOD_DEPS += $m-java))
|
||||
endif
|
||||
$(foreach m, $(GENDATA_MODULES), $(eval $m_JMOD_DEPS += $m-gendata))
|
||||
$(foreach m, $(RMIC_MODULES), $(eval $m_JMOD_DEPS += $m-rmic))
|
||||
$(foreach m, $(LIBS_MODULES), $(eval $m_JMOD_DEPS += $m-libs))
|
||||
@ -804,30 +791,28 @@ else
|
||||
# a normal build we run it from the exploded image, but when cross compiling
|
||||
# it's run from the buildjdk, which is either created at build time or user
|
||||
# supplied.
|
||||
#
|
||||
# For the exploded image to be runnable, all java modules and
|
||||
# jdk.jlink-launchers need to be built. We also need to copy jvm.cfg (done
|
||||
# in java.base-copy) and tzdb.dat (done in java.base-gendata) to the
|
||||
# appropriate location otherwise jimage, jlink and jmod won't start. This
|
||||
# also applies when creating the buildjdk.
|
||||
DEFAULT_JMOD_DEPS += java.base-libs java.base-copy java.base-gendata \
|
||||
jdk.jlink-launchers
|
||||
# When cross compiling and buildjdk is to be created, depend on creating the
|
||||
# buildjdk instead of the default dependencies.
|
||||
ifeq ($(CREATE_BUILDJDK), true)
|
||||
# Avoid calling create-buildjdk from within a create-buildjdk call.
|
||||
ifneq ($(CREATING_BUILDJDK), true)
|
||||
# When cross compiling and buildjdk is to be created, simply depend on
|
||||
# creating the buildjdk.
|
||||
$(JMOD_TARGETS): create-buildjdk
|
||||
buildtools-modules: create-buildjdk
|
||||
else
|
||||
# While actually creating the buildjdk, the default deps applies.
|
||||
$(JMOD_TARGETS) $(INTERIM_JMOD_TARGETS): $(DEFAULT_JMOD_DEPS)
|
||||
# While actually creating the buildjdk, we need to list the bare
|
||||
# minimum dependencies needed before running jmod, to avoid building
|
||||
# more than necessary. This includes:
|
||||
# * all java modules
|
||||
# * jdk.jlink-launchers
|
||||
# * copy jvm.cfg (done in java.base-copy)
|
||||
# * tzdb.dat (done in java.base-gendata)
|
||||
# Without all of these jimage, jlink and jmod won't start.
|
||||
$(JMOD_TARGETS) $(INTERIM_JMOD_TARGETS): java.base-libs java.base-copy \
|
||||
java.base-gendata jdk.jlink-launchers java
|
||||
endif
|
||||
else
|
||||
# The normal non cross compilation case uses the default deps.
|
||||
# To avoid races with the optimize target, that also needs to happen first.
|
||||
$(JMOD_TARGETS) $(INTERIM_JMOD_TARGETS): $(DEFAULT_JMOD_DEPS) \
|
||||
exploded-image-optimize
|
||||
# The normal non cross compilation case uses needs to wait for the full
|
||||
# exploded-image to avoid a race with the optimize target.
|
||||
$(JMOD_TARGETS) $(INTERIM_JMOD_TARGETS): exploded-image
|
||||
endif
|
||||
|
||||
# All modules include the main license files from java.base.
|
||||
@ -915,14 +900,9 @@ else
|
||||
$(foreach t, $(filter-out test-make%, $(ALL_TEST_TARGETS)), $(eval $t: jdk-image test-image))
|
||||
$(foreach t, $(ALL_EXPLODED_TEST_TARGETS), $(eval $t: exploded-image test-image))
|
||||
|
||||
create-buildjdk-copy: jdk.jlink-java java.base-gendata \
|
||||
$(addsuffix -java, $(INTERIM_IMAGE_MODULES))
|
||||
|
||||
create-buildjdk-interim-image: create-buildjdk-copy
|
||||
|
||||
interim-image: $(INTERIM_JMOD_TARGETS)
|
||||
|
||||
build-test-lib: exploded-image-optimize
|
||||
build-test-lib: exploded-image
|
||||
|
||||
build-test-failure-handler: interim-langtools
|
||||
|
||||
@ -933,7 +913,7 @@ else
|
||||
|
||||
build-test-jdk-jtreg-native: buildtools-jdk java.base-libs
|
||||
|
||||
build-test-hotspot-jtreg-graal: exploded-image-optimize
|
||||
build-test-hotspot-jtreg-graal: exploded-image
|
||||
|
||||
test-image-hotspot-jtreg-native: build-test-hotspot-jtreg-native
|
||||
|
||||
@ -1025,7 +1005,7 @@ ifneq ($(COMPILE_TYPE), cross)
|
||||
exploded-image: exploded-image-optimize
|
||||
endif
|
||||
|
||||
create-buildjdk: create-buildjdk-copy create-buildjdk-interim-image
|
||||
create-buildjdk: create-buildjdk-interim-image
|
||||
|
||||
docs-jdk-api: docs-jdk-api-javadoc
|
||||
docs-javase-api: docs-javase-api-javadoc
|
||||
|
||||
@ -32,6 +32,9 @@ include @SPEC@
|
||||
|
||||
CC := @BUILD_CC@
|
||||
CXX := @BUILD_CXX@
|
||||
# Ideally this should be probed by configure but that is tricky to implement,
|
||||
# and this should work in most cases.
|
||||
CPP := @BUILD_CC@ -E
|
||||
LD := @BUILD_LD@
|
||||
LDCXX := @BUILD_LDCXX@
|
||||
AS := @BUILD_AS@
|
||||
@ -44,6 +47,7 @@ SYSROOT_LDFLAGS := @BUILD_SYSROOT_LDFLAGS@
|
||||
|
||||
# These directories should not be moved to BUILDJDK_OUTPUTDIR
|
||||
HOTSPOT_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(HOTSPOT_OUTPUTDIR))
|
||||
BUILDTOOLS_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(BUILDTOOLS_OUTPUTDIR))
|
||||
SUPPORT_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(SUPPORT_OUTPUTDIR))
|
||||
JDK_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(JDK_OUTPUTDIR))
|
||||
IMAGES_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(IMAGES_OUTPUTDIR))
|
||||
@ -77,6 +81,8 @@ JVM_LIBS := @OPENJDK_BUILD_JVM_LIBS@
|
||||
|
||||
FDLIBM_CFLAGS := @OPENJDK_BUILD_FDLIBM_CFLAGS@
|
||||
|
||||
INTERIM_LANGTOOLS_ARGS := $(subst $(OUTPUTDIR),$(BUILDJDK_OUTPUTDIR),$(INTERIM_LANGTOOLS_ARGS))
|
||||
|
||||
# The compiler for the build platform is likely not warning compatible with the official
|
||||
# compiler.
|
||||
WARNINGS_AS_ERRORS := false
|
||||
|
||||
@ -160,25 +160,26 @@ define SetupLogging
|
||||
SHELL = $$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(SHELL_NO_RECURSE) -x
|
||||
endif
|
||||
|
||||
# The LOG_PREFIX is set for sub recursive calls like buildjdk and bootcycle.
|
||||
# The warn level can never be turned off
|
||||
LogWarn = $$(info $$(strip $$1))
|
||||
LogWarn = $$(info $(LOG_PREFIX)$$(strip $$1))
|
||||
LOG_WARN :=
|
||||
ifneq ($$(findstring $$(LOG_LEVEL), info debug trace),)
|
||||
LogInfo = $$(info $$(strip $$1))
|
||||
LogInfo = $$(info $(LOG_PREFIX)$$(strip $$1))
|
||||
LOG_INFO :=
|
||||
else
|
||||
LogInfo =
|
||||
LOG_INFO := > /dev/null
|
||||
endif
|
||||
ifneq ($$(findstring $$(LOG_LEVEL), debug trace),)
|
||||
LogDebug = $$(info $$(strip $$1))
|
||||
LogDebug = $$(info $(LOG_PREFIX)$$(strip $$1))
|
||||
LOG_DEBUG :=
|
||||
else
|
||||
LogDebug =
|
||||
LOG_DEBUG := > /dev/null
|
||||
endif
|
||||
ifneq ($$(findstring $$(LOG_LEVEL), trace),)
|
||||
LogTrace = $$(info $$(strip $$1))
|
||||
LogTrace = $$(info $(LOG_PREFIX)$$(strip $$1))
|
||||
LOG_TRACE :=
|
||||
else
|
||||
LogTrace =
|
||||
|
||||
@ -800,13 +800,13 @@ define SetupNativeCompilationBody
|
||||
# This is a rough heuristic and may not always print accurate information.
|
||||
$$($1_BUILD_INFO): $$($1_SRCS) $$($1_COMPILE_VARDEPS_FILE)
|
||||
ifeq ($$(wildcard $$($1_TARGET)), )
|
||||
$(ECHO) 'Creating $$(subst $$(OUTPUTDIR)/,,$$($1_TARGET)) from $$(words \
|
||||
$$(filter-out %.vardeps, $$?)) file(s)'
|
||||
$$(call LogWarn, Creating $$(subst $$(OUTPUTDIR)/,,$$($1_TARGET)) from $$(words \
|
||||
$$(filter-out %.vardeps, $$?)) file(s))
|
||||
else
|
||||
$(ECHO) $$(strip 'Updating $$(subst $$(OUTPUTDIR)/,,$$($1_TARGET))' \
|
||||
$$(call LogWarn, $$(strip Updating $$(subst $$(OUTPUTDIR)/,,$$($1_TARGET)) \
|
||||
$$(if $$(filter-out %.vardeps, $$?), \
|
||||
'due to $$(words $$(filter-out %.vardeps, $$?)) file(s)', \
|
||||
$$(if $$(filter %.vardeps, $$?), 'due to makefile changes')))
|
||||
due to $$(words $$(filter-out %.vardeps, $$?)) file(s), \
|
||||
$$(if $$(filter %.vardeps, $$?), due to makefile changes))))
|
||||
endif
|
||||
$(TOUCH) $$@
|
||||
|
||||
|
||||
@ -70,13 +70,15 @@ endif
|
||||
# preprocessor.
|
||||
define generate-preproc-src
|
||||
$(call MakeDir, $(@D))
|
||||
$(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/gensrc/java.base/_$(@F), \
|
||||
( $(NAWK) '/@@END_COPYRIGHT@@/{exit}1' $< && \
|
||||
$(CPP) $(CPP_FLAGS) $(SYSROOT_CFLAGS) $(CFLAGS_JDKLIB) $< \
|
||||
2> >($(GREP) -v '^$(<F)$$' >&2) \
|
||||
| $(NAWK) '/@@START_HERE@@/,0' \
|
||||
| $(SED) -e 's/@@START_HERE@@/\/\/ AUTOMATICALLY GENERATED FILE - DO NOT EDIT/' \
|
||||
-e 's/PREFIX_//' -e 's/^#.*//' \
|
||||
) > $@
|
||||
) > $@ \
|
||||
)
|
||||
endef
|
||||
|
||||
GENSRC_SOR_FILE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java
|
||||
|
||||
Loading…
Reference in New Issue
Block a user