make/common/NativeCompilation.gmk

changeset 2215
7a73b8b4ac8a
parent 2206
7ba4e17574e0
child 2217
310b1d9c5772
child 2219
cb1203f48728
equal deleted inserted replaced
2214:fda76d0c4b84 2215:7a73b8b4ac8a
370 $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HIGHEST) 370 $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HIGHEST)
371 else ifneq (, $$($1_OPTIMIZATION)) 371 else ifneq (, $$($1_OPTIMIZATION))
372 $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION)) 372 $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
373 endif 373 endif
374 374
375 # Add sys root specific cflags last
376 $1_EXTRA_CFLAGS += $(SYSROOT_CFLAGS)
377 $1_EXTRA_CXXFLAGS += $(SYSROOT_CFLAGS)
378
375 # Now call add_native_source for each source file we are going to compile. 379 # Now call add_native_source for each source file we are going to compile.
376 $$(foreach p,$$($1_SRCS), \ 380 $$(foreach p,$$($1_SRCS), \
377 $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \ 381 $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
378 $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \ 382 $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \
379 $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_ASFLAGS)))) 383 $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_ASFLAGS))))
414 $1_EXTRA_LDFLAGS:=$$($1_LDFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS)) 418 $1_EXTRA_LDFLAGS:=$$($1_LDFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS))
415 $1_EXTRA_LDFLAGS_SUFFIX:=$$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS)) 419 $1_EXTRA_LDFLAGS_SUFFIX:=$$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS))
416 ifneq (,$$($1_REAL_MAPFILE)) 420 ifneq (,$$($1_REAL_MAPFILE))
417 $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE)) 421 $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
418 endif 422 endif
423
424 $1_EXTRA_LDFLAGS += $(SYSROOT_LDFLAGS)
419 425
420 $1 := $$($1_TARGET) 426 $1 := $$($1_TARGET)
421 ifneq (,$$($1_LIBRARY)) 427 ifneq (,$$($1_LIBRARY))
422 # Generating a dynamic library. 428 # Generating a dynamic library.
423 $1_EXTRA_LDFLAGS+=$$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME)) 429 $1_EXTRA_LDFLAGS+=$$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))

mercurial