# HG changeset patch # User mduigou # Date 1367270474 25200 # Node ID f171aa801ea52665aeb02ec178e19719430ef3f4 # Parent a7a8302473d3a8437dcb08b73a7a72a5b1c61c66# Parent 10775618db00200c83f2cafccc99059d8e53d593 Merge diff -r a7a8302473d3 -r f171aa801ea5 common/makefiles/NativeCompilation.gmk --- a/common/makefiles/NativeCompilation.gmk Mon Apr 29 14:20:02 2013 -0700 +++ b/common/makefiles/NativeCompilation.gmk Mon Apr 29 14:21:14 2013 -0700 @@ -393,6 +393,8 @@ $1_EXTRA_LDFLAGS+="-implib:$$($1_OBJECT_DIR)/$$($1_LIBRARY).lib" endif + $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX) + ifneq (,$$($1_DEBUG_SYMBOLS)) ifeq ($(ENABLE_DEBUG_SYMBOLS), true) ifeq ($(OPENJDK_TARGET_OS), windows) @@ -531,6 +533,8 @@ endif endif + $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX) + $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST) $$(call LINKING_EXE_MSG,$$($1_BASENAME)) $$($1_LDEXE) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(EXE_OUT_OPTION)$$($1_TARGET) \