--- old/make/linux/makefiles/defs.make 2014-09-01 13:54:37.641031261 +0200 +++ new/make/linux/makefiles/defs.make 2014-09-01 13:54:37.511030503 +0200 @@ -28,6 +28,12 @@ SLASH_JAVA ?= /java +define print_info + ifneq ($$(LOG_LEVEL), warn) + $$(shell echo >&2 "INFO: $1") + endif +endef + # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name # ARCH can be set explicitly in spec.gmk @@ -185,8 +191,7 @@ # debug variants always get Full Debug Symbols (if available) ENABLE_FULL_DEBUG_SYMBOLS = 1 endif - _JUNK_ := $(shell \ - echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)") + $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) @@ -201,19 +206,16 @@ endif OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) ifneq ($(ALT_OBJCOPY),) - _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)") + $(eval $(call print_info, "ALT_OBJCOPY=$(ALT_OBJCOPY)")) OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) endif ifeq ($(OBJCOPY),) - _JUNK_ := $(shell \ - echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY.") + $(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY.")) ENABLE_FULL_DEBUG_SYMBOLS=0 - _JUNK_ := $(shell \ - echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)") + $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) else - _JUNK_ := $(shell \ - echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.") + $(eval $(call print_info, "$(OBJCOPY) cmd found so will create .debuginfo files.")) # Library stripping policies for .debuginfo configs: # all_strip - strips everything from the library @@ -227,13 +229,11 @@ # STRIP_POLICY ?= min_strip - _JUNK_ := $(shell \ - echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)") + $(eval $(call print_info, "STRIP_POLICY=$(STRIP_POLICY)")) ZIP_DEBUGINFO_FILES ?= 1 - _JUNK_ := $(shell \ - echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)") + $(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")) endif endif # ENABLE_FULL_DEBUG_SYMBOLS=1 endif # BUILD_FLAVOR