make/common/NativeCompilation.gmk

changeset 1409
c255ee6d08bb
parent 974
46696858adab
child 1482
8fb429038513
child 1879
fddd627ea372
equal deleted inserted replaced
1406:c641f979dff0 1409:c255ee6d08bb
321 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_release) 321 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_release)
322 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_release) 322 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_release)
323 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release) 323 $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
324 endif 324 endif
325 325
326 ifeq ($$($1_CXXFLAGS),)
327 $1_CXXFLAGS:=$$($1_CFLAGS)
328 endif
329 ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
330 $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
331 endif
332
326 ifneq (,$$($1_DEBUG_SYMBOLS)) 333 ifneq (,$$($1_DEBUG_SYMBOLS))
327 ifeq ($(ENABLE_DEBUG_SYMBOLS), true) 334 ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
328 ifdef OPENJDK 335 ifdef OPENJDK
329 # Always add debug symbols 336 # Always add debug symbols
330 $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS) 337 $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
336 $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS) 343 $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
337 $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS) 344 $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
338 endif 345 endif
339 endif 346 endif
340 endif 347 endif
341 endif
342
343 ifeq ($$($1_CXXFLAGS),)
344 $1_CXXFLAGS:=$$($1_CFLAGS)
345 endif
346 ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
347 $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
348 endif 348 endif
349 349
350 ifneq (,$$($1_REORDER)) 350 ifneq (,$$($1_REORDER))
351 $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER) 351 $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER)
352 $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER) 352 $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)

mercurial