Merge
authormduigou
Mon, 29 Apr 2013 14:21:14 -0700
changeset 17068 f900dd81c72c
parent 17067 61167bc712a4 (current diff)
parent 17066 b2bf9afdd360 (diff)
child 17069 ac6f63297cc1
child 21164 88400c3fa84e
Merge
--- 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) \