8205942: Build failure on macosx after JDK-8189429

Reviewed-by: tbell, lancea
This commit is contained in:
Erik Joelsson 2018-06-27 16:17:11 -07:00
parent 69106b4333
commit 0ac78340f3

View File

@ -35,7 +35,7 @@ SA_PROPERTIES := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/sa.properties
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 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
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)