Mercurial > hg > icedtea9-forest
changeset 463:4d45c7117e23
7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
Summary: Build option FULL_DEBUG_SYMBOLS=0 only affects OPT builds. Finish enabling ENABLE_FULL_DEBUG_SYMBOLS flag on Windows.
Reviewed-by: ohair, jmelvin, sspitsyn
| author | dcubed |
|---|---|
| date | Tue, 03 Apr 2012 10:17:06 -0700 |
| parents | 9a171072ff19 |
| children | 3b70add6ae45 |
| files | make/Defs-internal.gmk make/hotspot-rules.gmk make/jdk-rules.gmk |
| diffstat | 3 files changed, 34 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Defs-internal.gmk Fri Mar 30 16:51:57 2012 -0700 +++ b/make/Defs-internal.gmk Tue Apr 03 10:17:06 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2012, 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 @@ -354,3 +354,12 @@ COMMON_BUILD_ARGUMENTS += ANT_HOME="$(ANT_HOME)" endif +# When all repos support FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES, +# then these can be set here: +#ifdef FULL_DEBUG_SYMBOLS +# COMMON_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS) +#endif +# +#ifdef ZIP_DEBUGINFO_FILES +# COMMON_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)" +#endif
--- a/make/hotspot-rules.gmk Fri Mar 30 16:51:57 2012 -0700 +++ b/make/hotspot-rules.gmk Tue Apr 03 10:17:06 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2012, 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 @@ -71,6 +71,7 @@ ifeq ($(DEBUG_NAME), fastdebug) HOTSPOT_TARGET = all_fastdebug endif +BUILD_FLAVOR=$(HOTSPOT_TARGET:all_%=%) ifeq ($(ZERO_BUILD), true) ifeq ($(SHARK_BUILD), true) @@ -83,6 +84,7 @@ HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS) HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR) HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH) +HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR) # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=? # Or is there something wrong with hotspot/make/Makefile? @@ -93,6 +95,16 @@ HOTSPOT_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST) endif +# Move to COMMON_BUILD_ARGUMENTS when all repos support +# FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES: +ifdef FULL_DEBUG_SYMBOLS + HOTSPOT_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS) +endif + +ifdef ZIP_DEBUGINFO_FILES + HOTSPOT_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)" +endif + hotspot-build:: $(MKDIR) -p $(HOTSPOT_OUTPUTDIR) $(MKDIR) -p $(HOTSPOT_EXPORT_PATH)
--- a/make/jdk-rules.gmk Fri Mar 30 16:51:57 2012 -0700 +++ b/make/jdk-rules.gmk Tue Apr 03 10:17:06 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2012, 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 @@ -70,6 +70,16 @@ JDK_BUILD_ARGUMENTS += \ BUILD_HOTSPOT=$(BUILD_HOTSPOT) +# Move to COMMON_BUILD_ARGUMENTS when all repos support +# FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES: +ifdef FULL_DEBUG_SYMBOLS + JDK_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS) +endif + +ifdef ZIP_DEBUGINFO_FILES + JDK_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)" +endif + $(JDK_JAVA_EXE):: jdk-build