Mon, 29 Apr 2013 14:21:14 -0700
Merge
1.1 --- a/common/makefiles/NativeCompilation.gmk Mon Apr 29 14:20:02 2013 -0700 1.2 +++ b/common/makefiles/NativeCompilation.gmk Mon Apr 29 14:21:14 2013 -0700 1.3 @@ -393,6 +393,8 @@ 1.4 $1_EXTRA_LDFLAGS+="-implib:$$($1_OBJECT_DIR)/$$($1_LIBRARY).lib" 1.5 endif 1.6 1.7 + $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX) 1.8 + 1.9 ifneq (,$$($1_DEBUG_SYMBOLS)) 1.10 ifeq ($(ENABLE_DEBUG_SYMBOLS), true) 1.11 ifeq ($(OPENJDK_TARGET_OS), windows) 1.12 @@ -531,6 +533,8 @@ 1.13 endif 1.14 endif 1.15 1.16 + $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX) 1.17 + 1.18 $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST) 1.19 $$(call LINKING_EXE_MSG,$$($1_BASENAME)) 1.20 $$($1_LDEXE) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(EXE_OUT_OPTION)$$($1_TARGET) \