equal
deleted
inserted
replaced
447 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_release) |
447 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_release) |
448 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release) |
448 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release) |
449 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release) |
449 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release) |
450 endif |
450 endif |
451 |
451 |
|
452 # If no C++ flags are explicitly set, default to using the C flags. |
|
453 # After that, we can set additional C++ flags that should not interfere |
|
454 # with the mechanism for copying the C flags by default. |
|
455 ifeq ($$($1_CXXFLAGS),) |
|
456 $1_CXXFLAGS:=$$($1_CFLAGS) |
|
457 endif |
|
458 ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),) |
|
459 $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS) |
|
460 endif |
|
461 |
452 ifeq ($$($1_DEBUG_SYMBOLS), true) |
462 ifeq ($$($1_DEBUG_SYMBOLS), true) |
453 ifeq ($(ENABLE_DEBUG_SYMBOLS), true) |
463 ifeq ($(ENABLE_DEBUG_SYMBOLS), true) |
454 ifdef OPENJDK |
464 ifdef OPENJDK |
455 # Always add debug symbols |
465 # Always add debug symbols |
456 $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS) |
466 $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS) |
462 $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS) |
472 $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS) |
463 $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS) |
473 $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS) |
464 endif |
474 endif |
465 endif |
475 endif |
466 endif |
476 endif |
467 endif |
|
468 |
|
469 # If no C++ flags are explicitly set, default to using the C flags. |
|
470 # After that, we can set additional C++ flags that should not interfere |
|
471 # with the mechanism for copying the C flags by default. |
|
472 ifeq ($$($1_CXXFLAGS),) |
|
473 $1_CXXFLAGS:=$$($1_CFLAGS) |
|
474 endif |
|
475 ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),) |
|
476 $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS) |
|
477 endif |
477 endif |
478 |
478 |
479 ifneq (,$$($1_REORDER)) |
479 ifneq (,$$($1_REORDER)) |
480 $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER) |
480 $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER) |
481 $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER) |
481 $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER) |