Blame SOURCES/pr2444.patch
|
 |
c2cb23 |
# HG changeset patch
|
|
|
c2cb23 |
# User omajid
|
|
|
c2cb23 |
# Date 1434565087 14400
|
|
|
c2cb23 |
# Wed Jun 17 14:18:07 2015 -0400
|
|
|
c2cb23 |
# Node ID 44d6e4ff3770e0d272cc5d5e5cf88762e108e2c5
|
|
|
c2cb23 |
# Parent d4d7a3107d2039e6077391cf83b70ff7074653b0
|
|
|
c2cb23 |
8087156, PR2444: SetupNativeCompilation ignores CFLAGS_release for cpp files
|
|
|
c2cb23 |
Reviewed-by: erikj, ihse
|
|
|
c2cb23 |
|
|
|
c2cb23 |
diff -r d4d7a3107d20 -r 44d6e4ff3770 make/common/NativeCompilation.gmk
|
|
|
c2cb23 |
--- openjdk///make/common/NativeCompilation.gmk Fri Jun 12 21:25:45 2015 +0100
|
|
|
c2cb23 |
+++ openjdk///make/common/NativeCompilation.gmk Wed Jun 17 14:18:07 2015 -0400
|
|
|
c2cb23 |
@@ -323,6 +323,13 @@
|
|
|
c2cb23 |
$1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
|
|
|
c2cb23 |
endif
|
|
|
c2cb23 |
|
|
|
c2cb23 |
+ ifeq ($$($1_CXXFLAGS),)
|
|
|
c2cb23 |
+ $1_CXXFLAGS:=$$($1_CFLAGS)
|
|
|
c2cb23 |
+ endif
|
|
|
c2cb23 |
+ ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
|
|
|
c2cb23 |
+ $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
|
|
|
c2cb23 |
+ endif
|
|
|
c2cb23 |
+
|
|
|
c2cb23 |
ifneq (,$$($1_DEBUG_SYMBOLS))
|
|
|
c2cb23 |
ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
|
|
|
c2cb23 |
ifdef OPENJDK
|
|
|
c2cb23 |
@@ -340,13 +347,6 @@
|
|
|
c2cb23 |
endif
|
|
|
c2cb23 |
endif
|
|
|
c2cb23 |
|
|
|
c2cb23 |
- ifeq ($$($1_CXXFLAGS),)
|
|
|
c2cb23 |
- $1_CXXFLAGS:=$$($1_CFLAGS)
|
|
|
c2cb23 |
- endif
|
|
|
c2cb23 |
- ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
|
|
|
c2cb23 |
- $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
|
|
|
c2cb23 |
- endif
|
|
|
c2cb23 |
-
|
|
|
c2cb23 |
ifneq (,$$($1_REORDER))
|
|
|
c2cb23 |
$1_EXTRA_CFLAGS += $$(C_FLAG_REORDER)
|
|
|
c2cb23 |
$1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)
|