Mercurial > hg > openjdk > aarch64-port
changeset 1476:c255ee6d08bb
8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
Reviewed-by: erikj, ihse
author | omajid |
---|---|
date | Wed, 17 Jun 2015 14:18:07 -0400 |
parents | c641f979dff0 |
children | 723d248d20e4 |
files | make/common/NativeCompilation.gmk |
diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/NativeCompilation.gmk Fri Jun 12 18:44:19 2015 -0700 +++ b/make/common/NativeCompilation.gmk Wed Jun 17 14:18:07 2015 -0400 @@ -323,6 +323,13 @@ $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release) endif + ifeq ($$($1_CXXFLAGS),) + $1_CXXFLAGS:=$$($1_CFLAGS) + endif + ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),) + $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS) + endif + ifneq (,$$($1_DEBUG_SYMBOLS)) ifeq ($(ENABLE_DEBUG_SYMBOLS), true) ifdef OPENJDK @@ -340,13 +347,6 @@ endif endif - ifeq ($$($1_CXXFLAGS),) - $1_CXXFLAGS:=$$($1_CFLAGS) - endif - ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),) - $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS) - endif - ifneq (,$$($1_REORDER)) $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER) $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)