# HG changeset patch
# User mduigou
# Date 1367270474 25200
# Node ID f900dd81c72cdfdaad4506199b442075f01a3eb4
# Parent  61167bc712a447537d2933c788b7fc6c81c188d0# Parent  b2bf9afdd360fd8c5505a9d8928f2636585e36cc
Merge

diff -r 61167bc712a4 -r f900dd81c72c 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) \