提交 48b847fd 编写于 作者: E erikj

8010465: Can't enable sjavac when building in jprt.

Reviewed-by: ohair, tbell
上级 7242d2c5
...@@ -86,7 +86,7 @@ define SetupArchive ...@@ -86,7 +86,7 @@ define SetupArchive
# NOTE: $2 is dependencies, not a named argument! # NOTE: $2 is dependencies, not a named argument!
$(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE)) $(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
$(call LogSetupMacroEntry,SetupArchive($1),<dependencies>,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15)) $(call LogSetupMacroEntry,SetupArchive($1),<dependencies>,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
$(if $(findstring $(LOG),debug trace), $(info *[2] <dependencies> = $(strip $2))) $(if $(findstring $(LOG_LEVEL),debug trace), $(info *[2] <dependencies> = $(strip $2)))
$(if $(16),$(error Internal makefile error: Too many arguments to SetupArchive, please update JavaCompilation.gmk)) $(if $(16),$(error Internal makefile error: Too many arguments to SetupArchive, please update JavaCompilation.gmk))
$1_JARMAIN:=$(strip $$($1_JARMAIN)) $1_JARMAIN:=$(strip $$($1_JARMAIN))
...@@ -505,7 +505,7 @@ define SetupJavaCompilation ...@@ -505,7 +505,7 @@ define SetupJavaCompilation
--permit-unidentified-artifacts \ --permit-unidentified-artifacts \
--permit-sources-without-package \ --permit-sources-without-package \
--compare-found-sources $$($1_BIN)/_the.batch.tmp \ --compare-found-sources $$($1_BIN)/_the.batch.tmp \
--log=$(LOG) \ --log=$(LOG_LEVEL) \
$$($1_SJAVAC_ARGS) \ $$($1_SJAVAC_ARGS) \
$$($1_FLAGS) \ $$($1_FLAGS) \
$$($1_HEADERS_ARG) \ $$($1_HEADERS_ARG) \
......
...@@ -103,6 +103,9 @@ endif ...@@ -103,6 +103,9 @@ endif
ifdef ALT_FREETYPE_HEADERS_PATH ifdef ALT_FREETYPE_HEADERS_PATH
@$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
endif endif
ifdef ENABLE_SJAVAC
@$(ECHO) " --enable-sjavac" >> $@.tmp
endif
ifeq ($(HOTSPOT_AVAILABLE),false) ifeq ($(HOTSPOT_AVAILABLE),false)
ifdef ALT_JDK_IMPORT_PATH ifdef ALT_JDK_IMPORT_PATH
@$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp @$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp
......
...@@ -328,7 +328,7 @@ $(ECHO) $1/$(HGTIP_FILENAME) ...@@ -328,7 +328,7 @@ $(ECHO) $1/$(HGTIP_FILENAME)
endef endef
define SetupLogging define SetupLogging
ifeq ($$(LOG), trace) ifeq ($$(LOG_LEVEL),trace)
# Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make # Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make
# For each target executed, will print # For each target executed, will print
# Building <TARGET> (from <FIRST PREREQUISITE>) (<ALL NEWER PREREQUISITES> newer) # Building <TARGET> (from <FIRST PREREQUISITE>) (<ALL NEWER PREREQUISITES> newer)
...@@ -339,17 +339,17 @@ define SetupLogging ...@@ -339,17 +339,17 @@ define SetupLogging
endif endif
# Never remove warning messages; this is just for completeness # Never remove warning messages; this is just for completeness
LOG_WARN= LOG_WARN=
ifneq ($$(findstring $$(LOG),info debug trace),) ifneq ($$(findstring $$(LOG_LEVEL),info debug trace),)
LOG_INFO= LOG_INFO=
else else
LOG_INFO=> /dev/null LOG_INFO=> /dev/null
endif endif
ifneq ($$(findstring $$(LOG),debug trace),) ifneq ($$(findstring $$(LOG_LEVEL),debug trace),)
LOG_DEBUG= LOG_DEBUG=
else else
LOG_DEBUG=> /dev/null LOG_DEBUG=> /dev/null
endif endif
ifneq ($$(findstring $$(LOG),trace),) ifneq ($$(findstring $$(LOG_LEVEL),trace),)
LOG_TRACE= LOG_TRACE=
else else
LOG_TRACE=> /dev/null LOG_TRACE=> /dev/null
...@@ -362,7 +362,7 @@ $(eval $(call SetupLogging)) ...@@ -362,7 +362,7 @@ $(eval $(call SetupLogging))
# This is to be called by all SetupFoo macros # This is to be called by all SetupFoo macros
define LogSetupMacroEntry define LogSetupMacroEntry
$(if $(26),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk)) $(if $(26),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk))
$(if $(findstring $(LOG),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25,$(if $($i),$(NEWLINE) $(strip [$i] $($i)))))) $(if $(findstring $(LOG_LEVEL),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25,$(if $($i),$(NEWLINE) $(strip [$i] $($i))))))
endef endef
# Make directory without forking mkdir if not needed # Make directory without forking mkdir if not needed
......
...@@ -184,26 +184,34 @@ define ParseLogLevel ...@@ -184,26 +184,34 @@ define ParseLogLevel
LOG_STRIPPED2=$$(subst nofile,,$$(LOG_STRIPPED1)) LOG_STRIPPED2=$$(subst nofile,,$$(LOG_STRIPPED1))
# We might have ended up with a leading comma. Remove it # We might have ended up with a leading comma. Remove it
LOG_STRIPPED3=$$(strip $$(patsubst $$(COMMA)%,%,$$(LOG_STRIPPED2))) LOG_STRIPPED3=$$(strip $$(patsubst $$(COMMA)%,%,$$(LOG_STRIPPED2)))
override LOG:=$$(LOG_STRIPPED3) LOG_LEVEL:=$$(LOG_STRIPPED3)
else
LOG_LEVEL:=$$(LOG)
endif endif
ifeq ($$(LOG),) ifeq ($$(LOG_LEVEL),)
# Set LOG to "warn" as default if not set (and no VERBOSE given) # Set LOG to "warn" as default if not set (and no VERBOSE given)
override LOG=warn override LOG_LEVEL=warn
endif endif
ifeq ($$(LOG),warn) ifeq ($$(LOG_LEVEL),warn)
VERBOSE=-s VERBOSE=-s
else ifeq ($$(LOG),info) else ifeq ($$(LOG_LEVEL),info)
VERBOSE=-s VERBOSE=-s
else ifeq ($$(LOG),debug) else ifeq ($$(LOG_LEVEL),debug)
VERBOSE= VERBOSE=
else ifeq ($$(LOG),trace) else ifeq ($$(LOG_LEVEL),trace)
VERBOSE= VERBOSE=
else else
$$(info Error: LOG must be one of: warn, info, debug or trace.) $$(info Error: LOG must be one of: warn, info, debug or trace.)
$$(eval $$(call FatalError)) $$(eval $$(call FatalError))
endif endif
else else
# Provide resonable interpretations of LOG_LEVEL if VERBOSE is given.
ifeq ($(VERBOSE),)
LOG_LEVEL:=debug
else
LOG_LEVEL:=warn
endif
ifneq ($$(LOG),) ifneq ($$(LOG),)
# We have both a VERBOSE and a LOG argument. This is OK only if this is a repeated call by ourselves, # We have both a VERBOSE and a LOG argument. This is OK only if this is a repeated call by ourselves,
# but complain if this is the top-level make call. # but complain if this is the top-level make call.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册