--- a/jdk/makefiles/Tools.gmk	Thu Oct 10 10:09:19 2013 -0700
+++ b/jdk/makefiles/Tools.gmk	Tue Oct 15 08:26:38 2013 -0700
@@ -154,6 +154,7 @@
 
 # Tools needed on solaris because OBJCOPY is broken.
 
+ifeq ($(OPENJDK_TARGET_OS), solaris)
 $(eval $(call SetupNativeCompilation,ADD_GNU_DEBUGLINK,\
 		SRC:=$(JDK_TOPDIR)/make/tools/add_gnu_debuglink,\
 		LANG:=C,\
@@ -173,3 +174,4 @@
 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/fix_empty_sec_hdr_flags,\
 		OUTPUT_DIR:=$(JDK_OUTPUTDIR)/btbin,\
                 PROGRAM:=fix_empty_sec_hdr_flags))
+endif