diff options
| author | Alexey Ushakov <alexey.ushakov@jetbrains.com> | 2016-02-15 14:09:30 +0300 |
|---|---|---|
| committer | Alexey Ushakov <alexey.ushakov@jetbrains.com> | 2016-02-15 14:09:30 +0300 |
| commit | e0fcd178a489fc8d514e953391bb9ea7226230b5 (patch) | |
| tree | 0cfb06b4d5e0477a2349fa8dbaba5468ead1a14d /make/common/NativeCompilation.gmk | |
| parent | a4570eec1dfdd8f9256c90409bdfab69aed0f4e7 (diff) | |
| parent | 8818da12ef2196e11be91864c46355944e34e330 (diff) | |
| download | jdk8u-jetbrains-master-mirror-osx.tar.gz | |
Merged changes from defaultjetbrains-master-mirror-osx
--HG--
branch : 8u40-verified-fixes
Diffstat (limited to 'make/common/NativeCompilation.gmk')
| -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) |