--- a/make/Init.gmk Tue Apr 10 11:59:53 2018 +0200
+++ b/make/Init.gmk Fri Apr 13 10:31:49 2018 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2018, 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
@@ -226,6 +226,15 @@
# Parse COMPARE_BUILD (for makefile development)
$(eval $(call ParseCompareBuild))
+ # If no LOG= was given on command line, but we have a non-standard default
+ # value, use that instead and re-parse log level.
+ ifeq ($(LOG), )
+ ifneq ($(DEFAULT_LOG), )
+ override LOG := $(DEFAULT_LOG)
+ $(eval $(call ParseLogLevel))
+ endif
+ endif
+
ifeq ($(LOG_NOFILE), true)
# Disable build log if LOG=[level,]nofile was given
override BUILD_LOG_PIPE :=