Merge pull request #52540 from hedning/cherry-pick-valgrind
valgrind: fix build on darwin
This commit is contained in:
commit
a16a9fc4e5
|
@ -31,12 +31,8 @@ stdenv.mkDerivation rec {
|
|||
in ''
|
||||
echo "Don't derive our xnu version using uname -r."
|
||||
substituteInPlace configure --replace "uname -r" "echo ${OSRELEASE}"
|
||||
''
|
||||
);
|
||||
|
||||
postPatch = stdenv.lib.optionalString (stdenv.isDarwin)
|
||||
# Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666).
|
||||
''
|
||||
# Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666).
|
||||
echo "getting rid of the \`-arch' GCC option..."
|
||||
find -name Makefile\* -exec \
|
||||
sed -i {} -e's/DARWIN\(.*\)-arch [^ ]\+/DARWIN\1/g' \;
|
||||
|
@ -60,7 +56,10 @@ stdenv.mkDerivation rec {
|
|||
echo "substitute hardcoded /usr/bin/ld with ${cctools}/bin/ld"
|
||||
substituteInPlace coregrind/link_tool_exe_darwin.in \
|
||||
--replace /usr/bin/ld ${cctools}/bin/ld
|
||||
'';
|
||||
'');
|
||||
|
||||
# To prevent rebuild on linux when moving darwin's postPatch fixes to preConfigure
|
||||
postPatch = "";
|
||||
|
||||
configureFlags =
|
||||
stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit";
|
||||
|
|
Loading…
Reference in a new issue