8205942: Build failure on macosx after JDK-8189429
authorerikj
Wed, 27 Jun 2018 16:17:11 -0700
changeset 50854 55db6189e827
parent 50853 5ee8decaf35e
child 50855 9ca5f18240b2
8205942: Build failure on macosx after JDK-8189429 Reviewed-by: tbell, lancea
make/gensrc/Gensrc-jdk.hotspot.agent.gmk
--- a/make/gensrc/Gensrc-jdk.hotspot.agent.gmk	Wed Jun 27 15:15:11 2018 -0700
+++ b/make/gensrc/Gensrc-jdk.hotspot.agent.gmk	Wed Jun 27 16:17:11 2018 -0700
@@ -35,7 +35,7 @@
 SA_BUILD_VERSION_PROP_NAME := "sun.jvm.hotspot.runtime.VM.saBuildVersion"
 
 $(SA_PROPERTIES): $(call DependOnVariable, VERSION_STRING)
-	$(MKDIR) -p $(@D)
+	$(call MakeTargetDir)
 	$(ECHO) "$(SA_BUILD_VERSION_PROP_NAME)=$(VERSION_STRING)" > $@
 
 TARGETS += $(SA_PROPERTIES)
@@ -49,7 +49,9 @@
   MACH_EXC_SERVER := $(MIG_OUTPUT_DIR)/mach_excServer.c
 
   $(MACH_EXC_SERVER): $(SDKROOT)/usr/include/mach/mach_exc.defs
-	$(MIG) -isysroot $(SDKROOT) -server $@ -user $(MACH_EXC_USER) \
+	$(call MakeTargetDir)
+	$(MIG) $(if $(SDKROOT), -isysroot $(SDKROOT)) \
+	    -server $@ -user $(MACH_EXC_USER) \
 	    -header $(MACH_EXC_HEADER) $(SDKROOT)/usr/include/mach/mach_exc.defs
 
   TARGETS += $(MACH_EXC_SERVER)