macos: Fix valgrind OS-X build: config.h not found (out-of-tree macOS builds). bz...

Patch from Rob Boehne.

diff --git a/NEWS b/NEWS
index dcbfce621f1ded093c33f8603a6267a467f67a21..19f911e13cc7aaf1d668f79438279ea9eda172c3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -138,6 +138,7 @@ where XXXXXX is the bug number as listed below.
 395709  PPC64 is missing support for the xvnegsp instruction
 395682  Accept read-only PT_LOAD segments and .rodata by ld -z separate-code
         == 384727
+396475  valgrind OS-X build: config.h not found (out-of-tree macOS builds)
 396887  arch_prctl should return EINVAL on unknown option
 397012  glibc ld.so uses arch_prctl on i386
 

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 4acacae00b9c69ac981be7905def04c48c13fd11..914a270edf99b92e340eab1239d71afa9f3aa2c3 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -736,7 +736,7 @@ if VGCONF_OS_IS_DARWIN
 
 BUILT_SOURCES += fixup_macho_loadcmds
 fixup_macho_loadcmds: fixup_macho_loadcmds.c
-       $(CC) -I $(top_srcdir) -g -Wall -o $@ $<
+       $(CC) -I$(top_srcdir) -I$(top_builddir) -g -Wall -o $@ $<
 
 CLEANFILES += fixup_macho_loadcmds
 

diff --git a/docs/internals/3_13_BUGSTATUS.txt b/docs/internals/3_13_BUGSTATUS.txt
index 1cc17d7933b34337999cbd99ac3fdabe514e3ae0..3db6a030b8f1f539241890030eb00d89c1e721c6 100644 (file)
--- a/docs/internals/3_13_BUGSTATUS.txt
+++ b/docs/internals/3_13_BUGSTATUS.txt
@@ -853,7 +853,6 @@ Mon  6 Aug 11:04:50 CEST 2018
 396369  WARNING: unhandled amd64-linux syscall: 332
 396415  Valgrind is not looking up $ORIGIN rpath of shebang programs
 396452  none/test/arm/vfp.c doesn't build with binutils 2.31 gas
-396475  valgrind OS-X build: config.h not found
 396476  Reading debug info of binaries with zero-size PT_LOAD segment
 396656  Warnings while reading debug info
 396706  VEX issue with AMD64 SHR instruction?