diff options
| author | omajid <none@none> | 2015-06-17 14:18:07 -0400 |
|---|---|---|
| committer | omajid <none@none> | 2015-06-17 14:18:07 -0400 |
| commit | 8145feb25f5ebe54da15440d4833b4346e48a5a3 (patch) | |
| tree | fcf967fd2316285478954913ebaa018cd61ac646 /make/common | |
| parent | 1e492ab8453f3ccbb664ddf03883779894bcca8a (diff) | |
| download | jdk8u-8145feb25f5ebe54da15440d4833b4346e48a5a3.tar.gz | |
8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
Reviewed-by: erikj, ihse
Diffstat (limited to 'make/common')
| -rw-r--r-- | make/common/NativeCompilation.gmk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk index 161d211..494ebef 100644 --- a/make/common/NativeCompilation.gmk +++ b/make/common/NativeCompilation.gmk @@ -323,6 +323,13 @@ define SetupNativeCompilation $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 @@ define SetupNativeCompilation 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) |