--- old/make/launcher/LauncherCommon.gmk	2015-10-15 12:36:42.335768751 -0400
+++ new/make/launcher/LauncherCommon.gmk	2015-10-15 12:36:41.627728931 -0400
@@ -106,10 +106,30 @@
       endif
     endif
 
-    $1_LDFLAGS += -Wl,-all_load $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a \
-        -framework Cocoa -framework Security -framework ApplicationServices \
-        -sectcreate __TEXT __info_plist $(MACOSX_PLIST_DIR)/$$($1_PLIST_FILE)
-        $1_LDFLAGS_SUFFIX += -pthread
+    ifeq ($(BUILD_STATIC), true)
+      $1_LDFLAGS += -Wl,-all_load \
+          $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/modules_libs/java.base -name "*.a") \
+          $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.jdwp.agent/libdt_socket.a \
+          $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.jdwp.agent/libjdwp.a \
+          $(SUPPORT_OUTPUTDIR)/native/java.base/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX) \
+          -framework CoreFoundation \
+          -framework Foundation \
+          -framework SystemConfiguration \
+          -framework Cocoa -framework Security \
+          -framework ApplicationServices \
+          -lstdc++ -liconv \
+          -sectcreate __TEXT __info_plist \
+          $(MACOSX_PLIST_DIR)/$$($1_PLIST_FILE) \
+          -exported_symbols_list \
+              $(SUPPORT_OUTPUTDIR)/build-static/exported.symbols
+    else
+      $1_LDFLAGS += -Wl,-all_load $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a \
+          -framework Cocoa -framework Security -framework ApplicationServices \
+          -sectcreate __TEXT __info_plist $(MACOSX_PLIST_DIR)/$$($1_PLIST_FILE)
+          $1_LDFLAGS_SUFFIX += -pthread
+    endif
+
+
   endif
 
   ifeq ($(OPENJDK_TARGET_OS), aix)