OpenJDK / portola / portola
changeset 27772:a0a13701758d
8065913: Various improvements in SetupNativeCompilation
Reviewed-by: erikj
| author | ihse |
|---|---|
| date | Wed, 26 Nov 2014 15:15:27 +0100 |
| parents | 360714d431ab |
| children | 938fb14f357a |
| files | jdk/make/launcher/Launcher-jdk.runtime.gmk jdk/make/lib/LibCommon.gmk |
| diffstat | 2 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/launcher/Launcher-jdk.runtime.gmk Wed Nov 26 15:28:46 2014 +0800 +++ b/jdk/make/launcher/Launcher-jdk.runtime.gmk Wed Nov 26 15:15:27 2014 +0100 @@ -77,7 +77,7 @@ EXE_OUT_OPTION := -Fe # With the current way unpack200 is built, debug symbols aren't supported # anyway. - UNPACKEXE_DEBUG_SYMBOLS := + UNPACKEXE_DEBUG_SYMBOLS := false endif # The linker on older SuSE distros (e.g. on SLES 10) complains with:
--- a/jdk/make/lib/LibCommon.gmk Wed Nov 26 15:28:46 2014 +0800 +++ b/jdk/make/lib/LibCommon.gmk Wed Nov 26 15:15:27 2014 +0100 @@ -45,15 +45,17 @@ # elegant solution to this. WIN_JAVA_LIB := $(JDK_OUTPUTDIR)/objs/libjava/java.lib -# Use this variable to set DEBUG_SYMBOLS true on windows for all libraries, but -# not on other platforms. -ifeq ($(OPENJDK_TARGET_OS), windows) +ifdef OPENJDK + # Build everything with debugging on OpenJDK DEBUG_ALL_BINARIES := true -endif - -# Build everything with debugging on OpenJDK -ifdef OPENJDK - DEBUG_ALL_BINARIES := true +else + # Use this variable to set DEBUG_SYMBOLS true on windows for all libraries, but + # not on other platforms. + ifeq ($(OPENJDK_TARGET_OS), windows) + DEBUG_ALL_BINARIES := true + else + DEBUG_ALL_BINARIES := false + endif endif ################################################################################