8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files

Reviewed-by: erikj, ihse

8087156: SetupNativeCompilation ignores CFLAGS_release for cpp files
Reviewed-by: erikj, ihse
cc0452fe · omajid · d889e7e0 · cc0452fe
显示空白变更内容
内联并排

Showing with 7 addition and 7 deletion

make/common/NativeCompilation.gmk make/common/NativeCompilation.gmk +7 -7

未找到文件。
--- 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)