1.1 --- a/make/windows/makefiles/defs.make Fri Nov 02 07:44:11 2012 -0700
1.2 +++ b/make/windows/makefiles/defs.make Mon Nov 05 19:33:44 2012 -0500
1.3 @@ -131,23 +131,29 @@
1.4 # overridden in some situations, e.g., a BUILD_FLAVOR != product
1.5 # build.
1.6
1.7 -ifeq ($(BUILD_FLAVOR), product)
1.8 - FULL_DEBUG_SYMBOLS ?= 1
1.9 - ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
1.10 -else
1.11 - # debug variants always get Full Debug Symbols (if available)
1.12 - ENABLE_FULL_DEBUG_SYMBOLS = 1
1.13 +# Due to the multiple sub-make processes that occur this logic gets
1.14 +# executed multiple times. We reduce the noise by at least checking that
1.15 +# BUILD_FLAVOR has been set.
1.16 +ifneq ($(BUILD_FLAVOR),)
1.17 + ifeq ($(BUILD_FLAVOR), product)
1.18 + FULL_DEBUG_SYMBOLS ?= 1
1.19 + ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
1.20 + else
1.21 + # debug variants always get Full Debug Symbols (if available)
1.22 + ENABLE_FULL_DEBUG_SYMBOLS = 1
1.23 + endif
1.24 + _JUNK_ := $(shell \
1.25 + echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
1.26 + MAKE_ARGS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)
1.27 +
1.28 + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1.29 + ZIP_DEBUGINFO_FILES ?= 1
1.30 + else
1.31 + ZIP_DEBUGINFO_FILES=0
1.32 + endif
1.33 + MAKE_ARGS += ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)
1.34 endif
1.35 -_JUNK_ := $(shell \
1.36 - echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
1.37 -MAKE_ARGS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)
1.38
1.39 -ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1.40 - ZIP_DEBUGINFO_FILES ?= 1
1.41 -else
1.42 - ZIP_DEBUGINFO_FILES=0
1.43 -endif
1.44 -MAKE_ARGS += ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)
1.45 MAKE_ARGS += RM="$(RM)"
1.46 MAKE_ARGS += ZIPEXE=$(ZIPEXE)
1.47
