--- a/jdk/make/lib/Lib-java.instrument.gmk	Fri Nov 14 13:46:19 2014 -0800
+++ b/jdk/make/lib/Lib-java.instrument.gmk	Fri Nov 21 16:05:11 2014 +0100
@@ -28,7 +28,7 @@
 ################################################################################
 
 LIBINSTRUMENT_SRC := $(JDK_TOPDIR)/src/java.instrument/share/native/libinstrument \
-    $(JDK_TOPDIR)/src/java.instrument/$(OPENJDK_TARGET_OS_API_DIR)/native/libinstrument \
+    $(JDK_TOPDIR)/src/java.instrument/$(OPENJDK_TARGET_OS_TYPE)/native/libinstrument \
     #
 LIBINSTRUMENT_CFLAGS := $(CFLAGS_JDKLIB) \
     $(addprefix -I, $(LIBINSTRUMENT_SRC)) \