sync with original

sowson · Nov 10, 2019 · 7ad3109 · 7ad3109
1 parent 04be4e7
commit 7ad3109
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -49,7 +49,7 @@ SUPP_FILES = \
  darwin9.supp darwin9-drd.supp \
  darwin10.supp darwin10-drd.supp \
  darwin11.supp darwin12.supp darwin13.supp darwin14.supp darwin15.supp \
- darwin16.supp darwin17.supp \
+ darwin16.supp darwin17.supp darwin18.supp darwin19.supp \
  bionic.supp \
  solaris11.supp solaris12.supp
 DEFAULT_SUPP_FILES = @DEFAULT_SUPP@

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
@@ -157,10 +157,10 @@ mach_hdrs += \
  m_mach/thread_act.h \
  m_mach/vm_map.h
 mach_defs += \
- @XCODE_DIR@/mach/mach_vm.defs \
-  @XCODE_DIR@/mach/task.defs \
-  @XCODE_DIR@/mach/thread_act.defs \
-  @XCODE_DIR@/mach/vm_map.defs
+ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/usr/include/mach/mach_vm.defs \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/usr/include/mach/task.defs \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/usr/include/mach/thread_act.defs \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/usr/include/mach/vm_map.defs
 endif
 
 # Be careful w.r.t. parallel builds. See section 27.9 of the automake info