diff options
author | ngie <ngie@FreeBSD.org> | 2014-12-27 17:20:24 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2014-12-27 17:20:24 +0000 |
commit | c090fc517208e815de2a2438446d2519910461da (patch) | |
tree | 0485c3e06aedfd31295ea9ba50fa8a3a441d6ef8 /Makefile.inc1 | |
parent | 21a79436a441088c1ab6ca532a219fdea77a07b6 (diff) | |
download | FreeBSD-src-c090fc517208e815de2a2438446d2519910461da.zip FreeBSD-src-c090fc517208e815de2a2438446d2519910461da.tar.gz |
MFC r275867:
Fix sporadic build failures due to race when running make installworld
when strip gets replaced at install time by adding it to ITOOLS for the
default usr.bin/xinstall STRIP_CMD
This will fix the failure noted in this Jenkins build step:
https://jenkins.freebsd.org/job/Build-UFS-image/688/
This will also fix the issue reported by alfred@ dealing with installing on
targets that differ from build hosts (e.g. installing on i386/i386 when built
on amd64/amd64)
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index c5c51d2..ddffb85 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -779,7 +779,7 @@ _nmtree_itools= nmtree ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ date echo egrep find grep id install ${_install-info} \ ln lockf make mkdir mtree ${_nmtree_itools} mv pwd_mkdb \ - rm sed sh sysctl test true uname wc ${_zoneinfo} \ + rm sed sh strip sysctl test true uname wc ${_zoneinfo} \ ${LOCAL_ITOOLS} # Needed for share/man |