diff -r 781823826ae0 -r ad7c7378a002 jdk/make/lib/SecurityLibraries.gmk
--- a/jdk/make/lib/SecurityLibraries.gmk	Fri Oct 30 00:02:35 2015 +0100
+++ b/jdk/make/lib/SecurityLibraries.gmk	Thu Nov 05 20:00:53 2015 +0100
@@ -46,13 +46,13 @@
         DISABLED_WARNINGS_clang := deprecated-declarations, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \
-            $(call SET_SHARED_LIBRARY_ORIGIN), \
-        LDFLAGS_SUFFIX_macosx := \
-            -fobjc-link-runtime \
+            $(call SET_SHARED_LIBRARY_ORIGIN) \
+            -fobjc-link-runtime, \
+        LIBS := \
             -framework JavaNativeFoundation \
             -framework CoreServices \
             -framework Security \
-            $(LDFLAGS_JDKLIB_SUFFIX), \
+            $(JDKLIB_LIBS), \
         OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxsecurity, \
         DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
 
@@ -64,4 +64,3 @@
 
   endif
 endif
-