# HG changeset patch # User mikael # Date 1404404216 25200 # Node ID 3ab9867d7786554986c63765a15c9857df96d1b0 # Parent 4e69740b1547d574d4b0c104d6e52b76f045cf03 8046818: Hotspot build system looking for sdt.h in the wrong place Reviewed-by: sla, dholmes diff -r 4e69740b1547 -r 3ab9867d7786 hotspot/make/linux/makefiles/dtrace.make --- a/hotspot/make/linux/makefiles/dtrace.make Thu Jul 03 10:25:42 2014 -0400 +++ b/hotspot/make/linux/makefiles/dtrace.make Thu Jul 03 09:16:56 2014 -0700 @@ -40,7 +40,14 @@ ifneq ($(ALT_SDT_H),) SDT_H_FILE = $(ALT_SDT_H) else - SDT_H_FILE = /usr/include/sys/sdt.h + ifeq ($(USE_CLANG), true) + # Clang doesn't support the -print-sysroot option and there is no known equivalent + # option, so fall back to using / as sysroot + SDT_SYSROOT= + else + SDT_SYSROOT=$(shell $(CXX) -print-sysroot) + endif + SDT_H_FILE = $(SDT_SYSROOT)/usr/include/sys/sdt.h endif DTRACE_ENABLED = $(shell test -f $(SDT_H_FILE) && echo $(SDT_H_FILE))