Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/make/common/NativeCompilation.gmk	Fri Jun 12 18:44:19 2015 -0700
     1.2 +++ b/make/common/NativeCompilation.gmk	Wed Jun 17 14:18:07 2015 -0400
     1.3 @@ -323,6 +323,13 @@
     1.4      $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
     1.5    endif
     1.6  
     1.7 +  ifeq ($$($1_CXXFLAGS),)
     1.8 +    $1_CXXFLAGS:=$$($1_CFLAGS)
     1.9 +  endif
    1.10 +  ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
    1.11 +    $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
    1.12 +  endif
    1.13 +
    1.14    ifneq (,$$($1_DEBUG_SYMBOLS))
    1.15      ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
    1.16        ifdef OPENJDK
    1.17 @@ -340,13 +347,6 @@
    1.18      endif
    1.19    endif
    1.20  
    1.21 -  ifeq ($$($1_CXXFLAGS),)
    1.22 -    $1_CXXFLAGS:=$$($1_CFLAGS)
    1.23 -  endif
    1.24 -  ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
    1.25 -    $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
    1.26 -  endif
    1.27 -
    1.28    ifneq (,$$($1_REORDER))
    1.29      $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER)
    1.30      $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)